Integrity checks

After edits, ensure that the new code does not introduce any deadlocks or race conditions. Additionally, do not be wasteful with holding locks when something doesn't need it.