Added fish support and tweaked some things