Unblock

Please comment and review.
Created issue #37 to collect some of these comment/logging related issues.