Added comments and TODO notes in the source
Minor changes