Overhauls, pt2

Just a few edits, going to wait to hear back about some of my questions before continuing.