Fixes for Ch4
Fixes for Ch5, Sections 1 and 2 (full language termination TBD)