a bunch of tweaks :)