Small code changes made, map and TODO file added