Added a little more on some tasks