tidy it up. set for 1.0 release