Bunch of tweaks. Best commit message