diff --git a/src/main/java/org/caosdb/server/utils/ServerMessages.java b/src/main/java/org/caosdb/server/utils/ServerMessages.java
index 33a4b3005d91250b97cacfdc2af66de604dbf607..4b28848817eaa06f9516060953eda38265851024 100644
--- a/src/main/java/org/caosdb/server/utils/ServerMessages.java
+++ b/src/main/java/org/caosdb/server/utils/ServerMessages.java
@@ -166,7 +166,7 @@ public class ServerMessages {
       new Message(
           MessageType.Error,
           MessageCode.MESSAGE_CODE_CANNOT_MOVE_FILE_TO_TARGET_PATH,
-          "Could not move file to it's target folder.");
+          "Could not move file to its target folder.");
 
   public static final Message CANNOT_PARSE_DATETIME_VALUE =
       new Message(
@@ -190,7 +190,7 @@ public class ServerMessages {
       new Message(
           MessageType.Error,
           MessageCode.MESSAGE_CODE_CANNOT_PARSE_BOOL_VALUE,
-          "Cannot parse value to boolean (either 'true' or 'false', ignoring case).");
+          "Cannot parse value to boolean (either 'true' or 'false', case insensitive).");
 
   public static final Message CANNOT_CONNECT_TO_DATABASE =
       new Message(
@@ -202,7 +202,7 @@ public class ServerMessages {
       new Message(
           MessageType.Error,
           MessageCode.MESSAGE_CODE_UNKNOWN,
-          "Request Body was not a well-formed xml.");
+          "Request body was not a well-formed xml.");
 
   public static final Message REQUEST_BODY_EMPTY =
       new Message(MessageType.Error, MessageCode.MESSAGE_CODE_UNKNOWN, "Request body was empty.");
@@ -211,7 +211,7 @@ public class ServerMessages {
       new Message(
           MessageType.Error,
           MessageCode.MESSAGE_CODE_UNKNOWN,
-          "Request body didn't contain the expected Elements.");
+          "Request body didn't contain the expected elements.");
 
   public static final Message FILE_NOT_IN_DROPOFFBOX =
       new Message(
@@ -348,7 +348,7 @@ public class ServerMessages {
       new Message(MessageType.Error, MessageCode.MESSAGE_CODE_UNKNOWN, "Cannot parse EntityACL.");
 
   public static final Message ROLE_DOES_NOT_EXIST =
-      new Message(MessageType.Error, MessageCode.MESSAGE_CODE_UNKNOWN, "User Role does not exist.");
+      new Message(MessageType.Error, MessageCode.MESSAGE_CODE_UNKNOWN, "User role does not exist.");
 
   public static final Message ENTITY_NAME_DUPLICATES =
       new Message(
@@ -378,7 +378,7 @@ public class ServerMessages {
       new Message(
           MessageType.Error,
           MessageCode.MESSAGE_CODE_UNKNOWN,
-          "This password is too weak. It should be longer than 8 characters and sufficiently random. ");
+          "This password is too weak. It should be longer than 8 characters and sufficiently random.");
 
   public static final Message AFFILIATION_ERROR =
       new Message(
@@ -396,19 +396,19 @@ public class ServerMessages {
       new Message(
           MessageType.Error,
           MessageCode.MESSAGE_CODE_UNKNOWN,
-          "QueryTemplates may not be defined by 'COUNT...' queries for consistency reasons.");
+          "QueryTemplates may not be defined by 'COUNT' queries for consistency reasons.");
 
   public static final Message QUERY_TEMPLATE_WITH_SELECT =
       new Message(
           MessageType.Error,
           MessageCode.MESSAGE_CODE_UNKNOWN,
-          "QueryTemplates may not be defined by 'SELECT... FROM...' queries for consistency reasons.");
+          "QueryTemplates may not be defined by 'SELECT ... FROM ...' queries for consistency reasons.");
 
   public static final Message QUERY_PARSING_ERROR =
       new Message(
           MessageType.Error,
           MessageCode.MESSAGE_CODE_QUERY_PARSING_ERROR,
-          "An error occured during the parsing of this query. Maybe you use a wrong syntax?");
+          "An error occured during the parsing of this query. Maybe you were using a wrong syntax?");
 
   public static final Message NAME_PROPERTIES_MUST_BE_TEXT =
       new Message(
@@ -420,7 +420,7 @@ public class ServerMessages {
       new Message(
           MessageType.Warning,
           MessageCode.MESSAGE_CODE_PARENT_DUPLICATES_WARNING,
-          "This entity had parent duplicates. That is meaningless and only one parent had been inserted.");
+          "This entity had parent duplicates. That is meaningless and only one parent has been inserted.");
 
   public static final Message PARENT_DUPLICATES_ERROR =
       new Message(