db changes, refactored models.  Some formatting changes