more form tweaks