Removing some debug messages I put in.
Fix a race in blocking snapshot and uncomment some code that was commented out
by accident. WILL CLEAN UP THE COMMITS LATER.