Typo fix
noCourses & noAssignments condition
Minor tweaks
Formatting tweaks