escape types in snippets
minor fixes