diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java
index 2163509..8091409 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java
@@ -1,6 +1,7 @@
 package de.apps4ics.mountainnavigation;
 
 import android.app.Activity;
+import android.content.res.Resources;
 import android.location.Address;
 import android.location.Location;
 import android.os.AsyncTask;
@@ -91,22 +92,25 @@
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
                 if(actionId == EditorInfo.IME_ACTION_DONE) {
                     List<Address> addresses = null;
+                    String input = customLocationInput.getText().toString();
                     try {
-                        addresses = new GeocodingTask().execute(new String[]{ customLocationInput.getText().toString() }).get();
+                        addresses = new GeocodingTask().execute(new String[]{ input }).get();
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     } catch (ExecutionException e) {
                         e.printStackTrace();
                     }
+                    Resources res = MainActivity.getRes();
                     if(addresses.size() == 0) {
                         customLocationFound = false;
                         customLocation = null;
-                        //TODO translation
-                        InformDialog informDialog = new InformDialog("Could not find location", "The entered location could not be found. Try some bigger city near your location.");
+                        InformDialog informDialog = new InformDialog(String.format(res.getString(R.string.inform_gps_pos_not_found_title), input),
+                                res.getString(R.string.inform_gps_pos_not_found_msg));
                         informDialog.show(getFragmentManager(), "Inform Dialog");
                     } else {
                         Address address = addresses.get(0);
-                        MainActivity.Toaster(address.getLocality() + " found in " + address.getCountryName(), DownloadActivity.this);
+                        String msg = String.format(res.getString(R.string.download_weather_found_info), address.getLocality(), address.getCountryName());
+                        MainActivity.Toaster(msg, DownloadActivity.this);
                         customLocation = new Location("");
                         customLocation.setLatitude(address.getLatitude());
                         customLocation.setLongitude(address.getLongitude());
@@ -145,8 +149,9 @@
                         return;
                     }
                 } else if(!customLocationFound) {
-                    //TODO translation
-                    InformDialog informDialog = new InformDialog("Custom location not found", "Please enter a proper city name or empty the search field to use current location.");
+                    Resources res = MainActivity.getRes();
+                    InformDialog informDialog = new InformDialog(res.getString(R.string.inform_gps_custom_not_found_title),
+                            res.getString(R.string.inform_gps_custom_not_found_msg));
                     informDialog.show(getFragmentManager(), "Inform Dialog");
                     return;
                 } else {
@@ -161,7 +166,7 @@
                 } else if(currentSelected.equals(getString(R.string.download_current_key))) {
                     weatherHandler.getCurrentWeather(l, DownloadActivity.this);
                 } else if(currentSelected.equals(getString(R.string.download_day_key))) {
-                    //TODO
+                    //TODO CORE?
                 }
             }
         });
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/WeatherDatabase.java b/app/src/main/java/de/apps4ics/mountainnavigation/WeatherDatabase.java
index ae1eaf8..678f9fe 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/WeatherDatabase.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/WeatherDatabase.java
@@ -103,7 +103,7 @@
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        //TODO?
+        //TODO, not part of core
     }
 
     private MyWeather addLocationToWeather(Cursor cursor, MyWeather weather) {
@@ -162,6 +162,7 @@
         return rowId;
     }
 
+    //TODO CORE use offset and and check for timestamp
     public MyWeather getWeather(double lat, double lon, int offset) {
         SQLiteDatabase db = this.getReadableDatabase();
         Cursor locCursor = db.query(TABLE_LOCATION,
@@ -234,8 +235,8 @@
         values.put(KEY_WEATHER_CODE, weather.getWeatherCode());
         values.put(KEY_PRESSURE, weather.getPressure());
         values.put(KEY_HUMIDITY, weather.getHumidity());
-        values.put(KEY_MAIN, ""); //TODO what is main?
-        values.put(KEY_DESC, ""); //TODO what is desc?
+        values.put(KEY_MAIN, ""); //TODO CORE what is main?
+        values.put(KEY_DESC, ""); //TODO CORE what is desc?
         values.put(KEY_RAIN, weather.getRain());
         values.put(KEY_SNOW, weather.getSnow());
         values.put(KEY_CLOUDS, weather.getClouds());
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java
index 900a3fb..5c1a5c3 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java
@@ -617,7 +617,7 @@
         return rowId;
     }
 
-    //TODO recursive delete
+    //TODO CORE recursive delete (GeoPoint, [Image])
     public void deletePoi(long _id, int type){
         SQLiteDatabase db = this.getWritableDatabase();
         switch (type){
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java
index d20f028..88f6143 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java
@@ -524,7 +524,7 @@
                             }
                             last = current;
                         }
-                        //TODO disabled network calls for now
+                        //TODO CORE disabled network calls for now
                         /*Road road = roadManager.getRoad(waypoints);
                         Polyline line = RoadManager.buildRoadOverlay(road, getContext());
                         MainActivity.getMapView().getOverlays().add(line);
@@ -802,7 +802,7 @@
 
     @Override
     protected List<Marker> doInBackground(List<Poi>... params) {
-        //TODO get weather and rate POIs (if sunny, smaller fountains, ...)
+        //TODO get weather and rate POIs (if sunny, smaller fountains, ...), not part of core
         List<Marker> result = new ArrayList<>();
         List<Poi> tempPoiList = params[0]; //This is only one list
         for(int i=0; i<tempPoiList.size(); ++i){
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java
index 99a52e0..1562a65 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java
@@ -130,7 +130,6 @@
         else getCurrentWeatherCached(lat, lon, 0, callback);
     }
 
-    //TODO
     private void getCurrentWeatherOnline(double lat, double lon, final OnSingleWeatherRetrieved callback) {
         weatherClient.getCurrentCondition(new WeatherRequest(lon, lat), new WeatherClient.WeatherEventListener() {
             @Override
@@ -148,7 +147,6 @@
         });
     }
 
-    //TODO
     private void getCurrentWeatherCached(double lat, double lon, int offset, OnSingleWeatherRetrieved callback) {
         getFromDatabase(lat, lon, offset, callback);
     }
@@ -230,7 +228,7 @@
         });
     }
 
-    //TODO
+    //TODO CORE
     public void getForecastCached(double lat, double lon, int days, int offset, OnWeatherRetrieved callback) {
         return;
     }
@@ -257,7 +255,7 @@
         weatherClient.getHistoricalWeather(new WeatherRequest(lon, lat), startDate, endDate, new WeatherClient.HistoricalWeatherEventListener() {
             @Override
             public void onWeatherRetrieved(HistoricalWeather historicalWeather) {
-                //TODO check if it was sunny/rainy and set fountain options based on this
+                //TODO check if it was sunny/rainy and set fountain options based on this, not part of core
                 histWeather = historicalWeather;
             }
 
@@ -281,6 +279,7 @@
         callback.postRetrieve(weathers);
     }
 
+    //TODO, not part of core
     private void getHistoricalWeatherCached(double lat, double lon, long start, long end, OnWeatherRetrieved callback) {
         return;
     }
@@ -303,7 +302,7 @@
     }
 
     public void displayHints(MyWeather weather) {
-        //TODO add more hints
+        //TODO add more hints, currently enough
         if (MainActivity.showWeatherHints()) {
             Resources res = MainActivity.getRes();
             List<String> titles = new ArrayList<>();
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/overlays/MapDialogItemizedIconOverlay.java b/app/src/main/java/de/apps4ics/mountainnavigation/overlays/MapDialogItemizedIconOverlay.java
index 7a9ea1c..b37d1cf 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/overlays/MapDialogItemizedIconOverlay.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/overlays/MapDialogItemizedIconOverlay.java
@@ -153,7 +153,7 @@
     }
 
     private void checkForSelection(){
-        //TODO disable network calls for now
+        //TODO CORE disable network calls for now
         //mapView.getOverlays().remove(line);
         if(selected >= 2){
             //road = roadManager.getRoad(waypoints);
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddHutDialog.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddHutDialog.java
index 249ea88..920789f 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddHutDialog.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddHutDialog.java
@@ -36,7 +36,6 @@
  *
  * @author Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
  */
-//TODO beautify
 public class AddHutDialog extends DialogFragment {
     PoiHandler poiHandler;
 
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDialog.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDialog.java
index 286590f..80eea06 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDialog.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDialog.java
@@ -117,7 +117,7 @@
                             }
                             last = current;
                         }
-                        //TODO disabled network calls for now
+                        //TODO CORE disabled network calls for now
                         /*Road road = roadManager.getRoad(waypoints);
                         Polyline line = RoadManager.buildRoadOverlay(road, poiHandler.getContext());
                         MainActivity.getMapView().getOverlays().add(line);
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 6f9e72d..ff2282b 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -47,6 +47,10 @@
     <string name="navigation_drawer_close">Navigationsdrawer schließen</string>
     <string name="inform_title">Information</string>
     <string name="inform_gps_pos_not_found">Dein Standort konnte nicht ermittelt werden!\nBitte versuche es nochmal, sobald dein Standort gefunden wurde.</string>
+    <string name="inform_gps_pos_not_found_title">Konnte \'%1$s\' nicht finden</string>
+    <string name="inform_gps_pos_not_found_msg">Der eingegebene Ort konnte nicht gefunden werden. Versuche es mit einer größeren Stadt in der Nähe.</string>
+    <string name="inform_gps_custom_not_found_title">Spezifischer Ort nicht gefunden</string>
+    <string name="inform_gps_custom_not_found_msg">Bitte gib eine findbare Stadt ein oder lösche die Eingabe um deinen aktuellen Ort zu verwenden.</string>
     <string name="add_poi_success">Dein POI wurde erfolgreich hinzugefügt!</string>
     <string name="hint_dialog_title">Hinweise</string>
     <string name="hint_dialog_info_none">Keine weiteren Infos vorhanden</string>
@@ -98,6 +102,7 @@
     <string name="download_kind">Welche Wetterart möchtest du herunterladen?</string>
     <string name="download_custom_location">Spezifischer Ort</string>
     <string name="download_city_placehoder">Ort...</string>
+    <string name="download_weather_found_info">%1$s in %2$s gefunden</string>
     <string name="preferences_n_degree">%1$s°C</string>
     <string name="preferences_n_degree_floating">%1$.01f°C</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1b51fa4..ad03071 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -48,6 +48,10 @@
     <string name="navigation_drawer_close">Close navigation drawer</string>
     <string name="inform_title">Information</string>
     <string name="inform_gps_pos_not_found">Couldn\'t find your location!\nPlease try again after your position has been found.</string>
+    <string name="inform_gps_pos_not_found_title">Couldn\'t find \'%1$s\'</string>
+    <string name="inform_gps_pos_not_found_msg">The entered location could not be found. Try some bigger city near the location.</string>
+    <string name="inform_gps_custom_not_found_title">Custom location not found</string>
+    <string name="inform_gps_custom_not_found_msg">Please enter a proper city name or empty the search field to use current location.</string>
     <string name="add_poi_success">Sucessfully added your POI!</string>
     <string name="hint_dialog_title">Hints</string>
     <string name="hint_dialog_info_none">No additional info available</string>
@@ -100,6 +104,7 @@
     <string name="download_kind">What kind of weather do you want to download?</string>
     <string name="download_custom_location">Custom location</string>
     <string name="download_city_placehoder">Location...</string>
+    <string name="download_weather_found_info">%1$s found in %2$s</string>
     <string name="preferences_n_degree">%1$s°C</string>
     <string name="preferences_n_degree_floating">%1$.01f°C</string>