Updating github with latest production code v2.0 with a number of bug fixes and other small enhancements