update exercises and change 'rest' etc