small modifications to several features to run on a single token