updates and fixes to fish environment