Just some minor continuity fixes, + ch. 6 work