added more info
resolve merge conflicts
add notes, completed coding
Merge branch 'r2_index'