More modifications moving towards a unified threading model

See title