Several more minor tweaks and fixes