milestone 0.0.6

fixes for milestone 0.0.6 issues