Form Numbering fixed, and some refactoring