cleanup, reorg, and bug fixes