Reorganized fish configs and added some functions