Exercise 2.3: fix benchmarks
Chapter 3: initial datastructures
Exercise 3.2: inital layout