minor reorg; deplopy progress