fixed the parser's output a bit more