Numerous minor tweaks