Some minor comments / TODOs added in