revised several more mutexes to RwLocks