Chapter 6 finished, Chapter 2 updates, misc bugfixes