Added models, fixed errors