improve models, add comments to forms and models, fix errors, resolve circular import once and for all