quick edits

nothing major. some re-org, and a quick edit to one file