1.6 misc revisions

I meant to push this forever ago. Let me know if you need me to reorganize it, I've been adding stuff to this branch for uh.. A long time.