removed some redundant mutexes

... and some minor changes