More fish improvements