Various fixes/additions to models

Will break existing dbs - need to recreate.