added some content models, fixed bugs