Changed way too much

Damn it. Should have made more individual commits. So many changes.
3many5me.