threading bugs fixed