Fix small things and make snippets easier to paste into shell