some minor optimizations
Updates to TODO
Move core to ::Core and export constants. Start on test driver.