Two new manual chapters, some cosmetics