bugfixing of parser still missing, generally working