major frickin edits

see description