Bunch of untested changes to make stuff better