TODO list updated + some corrections