few fix while in class.