better parser
typo
TODO: whitespace issues
comment stuff out