Different gradding methods

And fixed silly average bug