more minor form tweaks