Added TODO list and removed error message