Minor changes and work on actual course