final tweaks for 1.0