added note, fixed some of download
fixed merge conflict