Stick ba629d7 output directly into page
Minor tweaks