code cleanup, work around simulator bug
properly upgrade the database when upgrading versions
fix the same bug ashley fixed. enjoy resolving the conflict :)
resolve merge