Added thorough TODO list for remaining fixes and improvements