a couple of tweaks
clean up some forms