commnet parsing fixes