tweaked some snippets