v0.4

some minor fixes and clean-up