add exercise 1.7, 1.8 and alterations