fix grades / add no conversion grading system
few fixes/improvements