Added TODO List
Small fixes
Minor fixes