lots of tasks improvements!