Fix CS, add comments