minor 5.3 / 5.4 fix.
reporting cleanup
course reporting cleanup
Merge branch 'back-end-working'