Changed some things about the parser