+ form tweaks