Comments fixed