Made the parser a bit better