Fix client/server chapter. Fix #6
Update agenda