rganize future tasks, remove from comment what is already done