fix comments, remove debug output