eager loading and assorted
Merge pull request #3 from annaswims/master

eager loading and assorted