bug fixes and updates for Production_2014_Aug_15