more reorganization / cleanup
hopefully finally having good parsing soon ...