0.0.4 changes and clean up