more fixing of the grade

some fixing and comments from Gunnar