some misc reorg