first round of tweaks