diff --git a/cache.py b/cache.py
index 883fa9d..ee4fef3 100644
--- a/cache.py
+++ b/cache.py
@@ -20,7 +20,7 @@ class Cache():
                log('removing cacheobject ' + key)
                del cache[key]
                return None
-           log( 'returning cacheobject ' + key)
+           # log( 'returning cacheobject ' + key)
            return cacheobj.obj
 
     def add(key, obj):
@@ -36,7 +36,7 @@ class CacheObj:
         self.time=datetime.now()
     
     def isOlderThanHours(self, hours):
-        log('checking time cacheobject ' + self.key + ': ' + str(self.time) + " < " + str(datetime.now() - timedelta(hours=hours)))
+        # log('checking time cacheobject ' + self.key + ': ' + str(self.time) + " < " + str(datetime.now() - timedelta(hours=hours)))
         return self.time < datetime.now() - timedelta(hours=hours)
   
       
diff --git a/utils/locationutils.py b/utils/locationutils.py
index 02921ae..af8a07a 100644
--- a/utils/locationutils.py
+++ b/utils/locationutils.py
@@ -1,9 +1,9 @@
 import re
 import os
 from pathlib import Path
-from cache import Cache
-from models.location import Countrycode, GeonameLocation
-
+from cache import Cache, FileCache
+from models.location import Countrycode, GeonameLocation, JsonEncoder
+from utils.helperutils import log;
 
 def getLocationArray(countrycode: Countrycode):
     cachename = 'locations_' + countrycode
@@ -23,26 +23,29 @@ def getLocationArray(countrycode: Countrycode):
             data = line.split("\t")
             alternatenames = []
             if data[3] != "":
-                alternatenames = data[3].lower().split(",") 
-            geoname = GeonameLocation(data[0], data[1].lower(), data[2].lower(), alternatenames, data[4], data[5], data[8], data[18])
+                alternatenames = [d.strip() for d in data[3].lower().split(",")] #makes from comma seperated a lowercase array and strips leading and trailing white spaces 
+            geoname = GeonameLocation(data[0], data[1].strip().lower(), data[2].strip().lower(), alternatenames, data[4], data[5], data[8], data[18])
             geonames.append(geoname)
 
         Cache.add(cachename,geonames)
+
         return geonames
 
 def getGeoLocationByCity(city = "", countrycode: Countrycode = Countrycode.NL ):
-    city = city.lower();
+    city = city.strip().lower(); #strips leading and trailing white spaces and makes it lowercase
 
     cityname = city
     if(not "gemeente" in cityname):
-        cityname = "gemeente "+ cityname
+        cityname = "gemeente " + cityname
 
     geonames = getLocationArray(countrycode)
 
+    # log('cityname and city: ' + cityname + " , " + city)
+
     #first tries name with 'gemeente as prefix'
     geo = list(filter(lambda g: g.name == cityname, geonames))
     if(geo): geo = geo[0]
-    #print('first try' + repr(geo))
+    # print('first try' + repr(geo))
     if (geo): return geo;
     #also tries in the alternatenames
     geo = list(filter(lambda g: inAlternatenames(g.alternatenames, cityname), geonames))
@@ -63,11 +66,11 @@ def getGeoLocationByCity(city = "", countrycode: Countrycode = Countrycode.NL ):
 
     #removes everything between () and then removes the leading and trailing spaces;
     
-    print('name before regex ' + city)
+    log('name before regex ' + city)
     #city = re.sub('/\([^()]*\)/g', '', city)
     city = re.sub("[\(].*?[\)]", "", city)
     city = city.strip();
-    print('name after regex ' + city)
+    log('name after regex ' + city)
 
     geo = list(filter(lambda g: g.name == city, geonames))
     if(geo): geo = geo[0]