Add more TODOs
Add copy task, and minor fixes