Add some various mappings
Improve some mappings
Improve some r snippets