Today fixes and tweaks