new exercises and fixes