Comments Fixed