More tweaks evening