exercise 2.85 and bugfixes in 79 and 84