Merging misc small improvements (stylistic, content, and JS)