cleanup, task changes, source credit