Reorganised/reordered BaseForm prototype functions
Uopdated a bunch of BaseForm type annotations