fix: basic race fixes in place
enhc: fixing tests...
fix: heavy refactoring to remove race conditions