bug fix vewrsion 1.1 fo r production
resolve merge conflict
added notes, completed coding