Some minor comments / TODOs added in
Merge remote-tracking branch 'origin/master'