more final tweaks for v1