Refactof some internals
Misc cleanup + stub out cancel