Some updates suggested during class and other minor changes