1.012 - minor tweaks