took out the surround mappings and added one to rule them all: ,s