working on course

+ small style fixes