renamed some callbacks
working mass-target removing punishments