bug fix 1.1 for production
resolved merge c-s
added notes