plenty of tweaks for v0.0.4