Some cleanup and testing on parser.
Still need to find more edge cases