Bugs fixed, parser tested