fixed numbering and improved layout. Parsing still poor, and not ready for prime time