Many improvements and drawing during the calculation is working now