Cleaned up, removed unused code and removed warnings.
Added support for graceful cancellation of execution (ctrl-C)
Added cancellation support on all console execution handlers
Added some more logging during cancellation