Fixed misplaced marginnotes and fixed two links.