cut cruft, added snippets