some minor fixes in chapter + first pass on the model