new grade types

+ safari fix for uninitialized localvar