Removed 2 tasks in the wrong place
Updated copyright & license info