Token updates, address regex fixed