general changes across the board - updated based on broken js
merging case