changes to mostly class things