Writing summary; some minor renamings