server side cleanup and form tweaks