Added TODO file and fixed minor things