more tweaks for 1.0