Enable snippets, misc cleanup