class fix

touch ups