Minor updates
* lots of work on client
* work on other chapters