typo
Fix parsestatements
Merge work from holiday
Fix parsing of declarations