final tweaks for v1