Threads are now named porperly
Merged locking