Bug fix, and comment-beautyfying