some fish config changes
merged