minor tweaks for v1