various minor updates and reorg