models.py git messages removed maybe hopefully
fixed some errors that got past my edits, all should be working now