More changes!

too much stuff is happening to this for me to be descriptive