Revised version: order of cells; minor fixes