remove debug output and add a few suggestive comments