Added TODO list + minor updates