Added TODO list
Updated config variables