Revert "a couple changes I hadn't synced, mostly commenting out debug messages."

This reverts commit f06c173f5a0fa25935a2a588b5e27ba12c6d3f3f.