Added things TODO and minor formatting

Signed-off-by: Siddharth Goel <siddharth98391@gmail.com>