0.0.7 fix up class names etc