fixes for exercise 2.3