PA-69 #comment: smaller updates
PA-69 #comment: reconstructing the def order for picking next task / activity