Some comment fixes