Updating comments and TODO