tidied, added author
new notes
moved newnotes
fixing conflict