dbschema fixes
models corrected
commit stuff