form fixes and issue closing