fixed models and init data
Merge branch 'master' of https://github.com/jmccarthy14/madtix