remap ,s and better foldmode for performance improvements