More scheme config tweaks and snippets