Minor changes. Added some TODOs in code