fixes to the model
Merge branch 'master' of github.com:sheankim/fabula
stop committing junk please