some cleanup getting ready for 0.0.7