Feature/more location data

Now polls every 20 minutes.