more updates, some reorg