More cleanup (removing Windows CR, adding sections)