Added TODOs and other comments