Work on several chapters

Chaos :(