Added/Changed comments and TODO's.