Bunch of tweaks and tasks.