Strip trailing whitespace, document !course
Merge in Istavan's work
Merge in Istavan's work