Fix links and add name to chapters