Added comments on TODOs