bug fix, v1.1 for index
resolve merge cofilict
added notes, completed coding