WIP: minor comments/reorg