Calculation and Drawing now in different threads; some improvements