Minor updates and fixes for new course.