Course instance changes

Fixes #300