speed up, Form->validation bug fix, const convention, refactor part 2, clean up