Changes definition for parallelism.
Various updates.