Fix a bunch of parsing errors.  Basic parsing now works.