And even more. Also added ToC.