updated tasks and cleanup
updated