lots of changes
added notes