minor parsing errors fixed after testrun