Major model changes; minor but messy style changes

and bunches of other crap because I'm bad about committing often. :(
stuff