- final tweaks for v0.4