Minor comments and additional TODO’s