Finished parsers and slight error fixes.