Updated deps, better previous token logic