threw away some design spikes; added :<, :> and :== tokens