lot of tweaks