Merged in update_displayed_token() and junk_displayed_token() from VaporEngine fork