cleaned up model. changed some javadocs and changed mostrecent assembly method