lots of cleanup
bump to 0.3.0