lotsa reorg, some more fixes