form fixes and include field descriptions