Add property annotation error recovery
Fix parsing errors, tests