I've arrived at most of the same conclusions other posters have, but it's worth A: writing them down and B: submitting them to scrutiny. My class changes mostly mirror GM81-PD's , whose suggestions are excellent (although not updated for newer material).
https://docs.google.com/document/d/1PoZkvAY9gKzEojpVUYrXCPPkaBc-uVi3gJHxawITBQ0/edit?usp=sharing
Edited by OrolandoRedirect to GDrive