Comment and oO fix