more edits, tightening stuff up