fixed preinit creation, update surround to evil-surround