Fixes/cleanup mostly around containers, also some hacky manipulation of Task methods to resolve issue with the global task type.