Updated to new licensing with client ID
Fixed some LocationController/MapController timing issues