Updated classes commands

Sorry for the metadata, the mac client is forcing me to put it here,
but not many changes in this push.