added more comments for TODOs