Minor improvements, bug fixes, refactoring. Core Data migration...