Further improvements of the Design chapter.