tidied up Stream.java, now ready to collate and javadoc
fixed (and shortened) the sort algorithm, hopefully.