Still some bugs

	i fixed some deadlocks,
	but obviously there are some
	other issues i can't find ...
	working on this, this branch
	will first be merged after all
	issues has been fixed :D