Some minor adjustments based on homework review during class