database upgrade, minor edits and backuo