Various Form validation improvements.
WIP cleanup
WIP cleanup