Add more detail for the new task, fix some small issues