Bunch o' small changes

Just check the commit log