Reworking the stage 2 handling
  - do not create one thread per CPU work unit, create as much threads
    as instructed by command line and each created threads consumes
    from the CPU work queue
Typo fix.
Merged changes from rework_stage_2 branch