course message -> features added + cleanup