Mostly addresses #582. Additional changes that will need to be made to s...

...how.js.coffee are noted in git.