Random improvements

I'm not even done but I have to wash the car so I'll leave this here. Enjoy.