Fixes lots of bugs + progress in Chap 4.6