massive edits, ready for polishing