Update comments and plan remaining updates