Revert "some small mistakes I noticed while going through the code with a fine-toothed comb:"

This reverts commit 997bddff3a11480f7e46c45e44bc100f136e99db.