Minor Parser changes

Also, thanks to Andres for contributing a TON on the parser