TODO list updated + minor syntax fix