Massive reordering.

Fixed a bug that prevented concurrent execution much of the time,
this revealed other bugs. still working through them.