Refactored into two-phase parse, updated readme, much cleanup was had by all