WIP: fix grading
WIP: fix grading: calc grade & rank