more corrections with the charge/entertype/classtype