Bugfix in Parser.

Also some minor changes.