model typo fixes etc...