fix error in setup protocol for fish
various updates