Edit chp 1-5 after suggestions by thusoy