Added cleanup and fixed fish