Added PartialToken and FillToken to things that need spaces