merge upstream of the IISM template, bug fixing, better table of contents and bibliography