models update to add for the other tables
corrections after chris's review
Luke's review corrections