improved token expander to be more effective and niceish