fix & improvements to multitasking