attempted some fixes to remove deadlocks due to synchronization