Merging pull request suggestions and cleaning

This merges in a few old pull requests adds a spec and cleans up the models.

@drwrchrds can you take a look at this and merge it in? :pray: :smiley: