remove todo marcs from DoneSet
some performace tweaks and status outs