Fix typo's, debug statements, C++-comment.