- fix up some broken parsing
- still need to clean up other code