Improve descriptions for mappings
Improve plugin comments