additional minor form tweaks