added some comments around some sections to revisit later