minor class upgrading

maintenence