Add Surround and fix complcache