Error handling, db sync, templates modified