minor fixes
threading issues removed