fixes for exercise 2.5