form fixes and cosmetic updates