Revert "Minor fixes"

This reverts commit 73c26c428359f065ae840ec5ddb50e93ca0d2e59.
refresh writeup.pdf after reverting last set of changes