Comment Fixes