images and notes updated
fixed merge conflicts