diff --git a/APED/app/src/main/assets/defaultConfig.json b/APED/app/src/main/assets/defaultConfig.json
index 9816475..9285101 100644
--- a/APED/app/src/main/assets/defaultConfig.json
+++ b/APED/app/src/main/assets/defaultConfig.json
@@ -1,5 +1,5 @@
 {
-  "address": "192.168.2.203",
+  "address": "192.168.1.100",
   "port" : 8080,
   "favorites" : [ ]
 }
\ No newline at end of file
diff --git a/APED/app/src/main/java/com/example/aped/MainActivity.java b/APED/app/src/main/java/com/example/aped/MainActivity.java
index 52ff8bc..b9bc7d5 100644
--- a/APED/app/src/main/java/com/example/aped/MainActivity.java
+++ b/APED/app/src/main/java/com/example/aped/MainActivity.java
@@ -2,7 +2,6 @@ package com.example.aped;
 
 import android.Manifest;
 import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -293,8 +292,8 @@ public class MainActivity extends AppCompatActivity {
     }
 
     /**
-     *                                                                                              paul
-     * @param xmlFile
+     * Method to set the config.xml to a default.
+     * @param xmlFile the config.xml file
      */
     private void setDefaultXML(final File xmlFile) {
         try {
@@ -307,23 +306,23 @@ public class MainActivity extends AppCompatActivity {
             fileOutputStream.write(buffer);
             fileOutputStream.close();
         } catch (Exception e) {
-           Log.e("MainActivity", "error while transferring the "
-            + "default.xml into the config.xml: " + e.getMessage());
+           Log.e("MainActivity", "error while transferring"
+            + "a default config: " + e.getMessage());
         }
     }
 
     /**
-     *                                                                                          paul
-     * @param xmlFile
+     * Method to set the config.json to a default.
+     * @param jsonFile the config.json file
      */
-    private void setDefaultConfig(final File xmlFile) {
+    private void setDefaultConfig(final File jsonFile) {
         try {
             InputStream inputStream = getAssets().open(
                     "defaultConfig.json");
             byte[] buffer = new byte[inputStream.available()];
             inputStream.read(buffer);
             inputStream.close();
-            FileOutputStream fileOutputStream = new FileOutputStream(xmlFile);
+            FileOutputStream fileOutputStream = new FileOutputStream(jsonFile);
             fileOutputStream.write(buffer);
             fileOutputStream.close();
         } catch (Exception e) {
diff --git a/APED/app/src/main/java/com/example/aped/communication/Communicator.java b/APED/app/src/main/java/com/example/aped/communication/Communicator.java
index 208281c..f2bec72 100644
--- a/APED/app/src/main/java/com/example/aped/communication/Communicator.java
+++ b/APED/app/src/main/java/com/example/aped/communication/Communicator.java
@@ -163,9 +163,9 @@ public class Communicator {
     }
 
     /**
-     *                                                                                      paul
-     * @param error
-     * @param method
+     * Method for handling various {@link VolleyError}.
+     * @param error the {@link VolleyError}
+     * @param method the name of the method where the error occurred
      */
     private void handleError(final VolleyError error, final String method) {
         if (error instanceof ServerError) {
@@ -181,6 +181,10 @@ public class Communicator {
         }
     }
 
+    /**
+     * Method for making a custom toast message for serious {@link VolleyError}.
+     * @param message the message to be displayed in the toast
+     */
     private void makeToast(final String message) {
        Toast toast = new Toast(mainActivity);
        View toastView = mainActivity.getLayoutInflater().inflate(R.layout.