more tweaks for v0.9