tweaks.. lots of tweaks