rc3 - more tweaks