more refactoring, fixed problem with the last fish so it now ends
correctly