bug fix v 1.1 for production
resolved merge conflict
added notes completed coding