Fixed up comment and operator handling.