Fixed some synchonization issues. 
A few times we lock on the entire class when thats not necessary.
No longer running at 100% CPU usage on computer at school