fish class small changes