updated task list
cleanups and simplifications