More form fixes
Another form
misc fixes