+ fixes to the models to get the base form application working and reflecting the structure more accurately