Updated Crystal parser and fixed small issue in system wrapping.

Merged Lauri Himanen requested to merge crystal_fixes into reprocess

Closes issues #480 (closed) and #481 (closed).

Merge request reports