Comment mappings, add more plugins
oops