added commented to all the code where we need to fix in the future