Cleaned up Fish and fixed util bug