More additions and checks for the threading model

See title