0.0.5, cleaned up some code