last bit of tweaks