Fixed misplaced marginnotes and fixed two reference links