Rewrote sepstream and tokenstream to be less ugly
s/seperator/separator/g