lots of tweaks for tomorrow