minor tweeks for 1.0