More snippets, adjust output in some