Fixed dependency race conditions.
Cleaned up.
Added in missing break points.