Task editing, specs, fixes, inprovemenets