fixes for the class