More Ch1-4 tweaks