Added more comments and inline TODOs