Fixed the issues with Restoring Accounts, and added some token handling changes to work ahead for when tokens are more heavily used.