Adding of fish config
Various changes..