Cleaned up, modify watch tasks
Cleaning up
Added some comments