authentication token tweaks

loop & wait for authentication to come through