added comments and to-do items