many bugfixes and exercise 2.97 done