Minor updates, and added lightweight Core Data migration from previous version.