reorg finished, related bugs fixed