Better contextual coding, some SaFrMo snippets added