updates to model and forms
added some validation moved some things around