various changes, including fish stuff
fixing missing end paren
remove extra space