using highlight.js and minor tweaks