diff --git a/src/main/java/net/doubledoordev/backend/server/Server.java b/src/main/java/net/doubledoordev/backend/server/Server.java
index 6f7975b..0c4bc24 100644
--- a/src/main/java/net/doubledoordev/backend/server/Server.java
+++ b/src/main/java/net/doubledoordev/backend/server/Server.java
@@ -93,7 +93,7 @@ public class Server
     private Logger logger;
     private File folder;
     private File propertiesFile;
-    private boolean propertiesLoaded = false;
+    private long propertiesFileLastModified = 0L;
     private Properties properties = new Properties();
 
     /**
@@ -201,8 +201,7 @@ public MCQuery getQuery()
      */
     public Properties getProperties()
     {
-        propertiesLoaded = true;
-        if (propertiesFile.exists())
+        if (propertiesFile.exists() && propertiesFile.lastModified() > propertiesFileLastModified)
         {
             try
             {
@@ -216,6 +215,7 @@ public Properties getProperties()
                 e.printStackTrace();
             }
         }
+        normalizeProperties();
         return properties;
     }
 
@@ -224,10 +224,7 @@ public Properties getProperties()
      */
     public void saveProperties()
     {
-        if (!propertiesLoaded) getProperties();
-
-        normalizeProperties();
-
+        getProperties();
         try
         {
             if (!propertiesFile.exists()) //noinspection ResultOfMethodCallIgnored
@@ -236,6 +233,7 @@ public void saveProperties()
             logger.debug("Saving properties with encoding: " + fileWriter.getEncoding());
             properties.store(fileWriter, "Minecraft server properties\nModified by D3Backend");
             fileWriter.close();
+            propertiesFileLastModified = propertiesFile.lastModified();
         }
         catch (IOException e)
         {
@@ -578,6 +576,7 @@ public List<String> getAdmins()
     @SuppressWarnings("UnusedDeclaration")
     public String getPropertiesAsText()
     {
+        getProperties();
         StringWriter stringWriter = new StringWriter();
         try
         {
@@ -690,6 +689,7 @@ public void run()
                             try
                             {
                                 last25LogLines.clear();
+                                last25LogLines.add("----=====##### STARTING SERVER #####=====-----");
                                 BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
                                 String line;
                                 while ((line = reader.readLine()) != null)
@@ -737,6 +737,7 @@ public boolean stopServer() throws ServerOnlineException
         try
         {
             getRCon().stop();
+            last25LogLines.add("----=====##### STOPPING SERVER WITH RCON #####=====-----");
             return true;
         }
         catch (Exception e)
@@ -744,6 +745,7 @@ public boolean stopServer() throws ServerOnlineException
             PrintWriter printWriter = new PrintWriter(process.getOutputStream());
             printWriter.println("stop");
             printWriter.flush();
+            last25LogLines.add("----=====##### STOPPING SERVER VIA STREAM #####=====-----");
             return false;
         }
     }
@@ -753,6 +755,7 @@ public boolean forceStopServer() throws Exception
     {
         if (!getOnline()) throw new ServerOfflineException();
         logger.warn("Killing server process!");
+        last25LogLines.add("----=====##### KILLING SERVER #####=====-----");
         process.destroy();
         try
         {
@@ -769,8 +772,6 @@ public boolean forceStopServer() throws Exception
             process.getInputStream().close();
         }
         catch (IOException ignored) {}
-        process.destroy();
-        process.exitValue();
         return true;
     }