Various Fixes, started Chapter 4