changed some things, added some notes.
Merge remote-tracking branch 'origin/master'