updating notes
reordering and cleaning up