Enhanced thread security

Also enhanced developer confusion