add fixes to Rakefile + improvement on fish config