1.46 to finish Chapter 1! And some comment cleanup on 1.45