Improved the parser. Finished up some query types