bug fix, v1.2 for production
resolved merge conflicts
added notes completed coding for release