Minor alterations, mainly task arguments