fix bug and add notes
merging changes