Various
Some code reorg
blah