Added a few comments / TODOs