lib/markupGenerator: Cleanup and bug fix
lib: updating method signatures for rubrics
lib/parser: added maxScore
Manual merge
Cleanup and clarity improvments