more form fixups