improvements for fish
improvements for vim