Changing image name (to be in the padran)
Minor fixes on comments
Updating TODO