cleaned up orm models
updates
Merge pull request #1 from sym3tri/updates

Updates