More fixes and tweaks (from the previous night)