bug fix, 1.1 for production
merged bug fix 1.1
added notes, completed coding