Lots of changes and new notes