wording changes for deadlocking
merged writeup