some cleanups, moved synchronization decorators out of class
cleaned up locking
improved speed by getting rid of parallelization, fixed double merge calls