large local db changes for parallel entity edits, review fixes