Removed alot of synchronization which is no longer needed (because the design is somewhat changed). Hopefully this will fix the hanging I've been seeing.