I found this paragraph on Wikipedia

"Fishes" is the proper English plural form of "fish" that biologists use when speaking about two or more fish species, as in "There are over 25,000 fishes in the world" (meaning that there are over 25,000 fish species in the world). When speaking of two or more individual fish organisms, then the word "fish" is used, as in "There are several million fish of the species Gadus morhua" (meaning that G. morhua comprises several million individuals). To see both in action, consider the statement "There are twelve fish in this aquarium, representing five fishes" (meaning that the aquarium contains twelve individuals, some of the same species and some of different species, for a total of five species). The usage of the two words is similar to that of the words "people" and "peoples". The collective noun for fish is shoal (or school).

So for those of you who laughed at me for writing 'fishes' earlier (and by "those of you" I mean Jen :P) : I was completely right. Yay! :D