diff --git a/doc/manual/team.rst b/doc/manual/team.rst
index fb13efb22c..dc9314cb14 100644
--- a/doc/manual/team.rst
+++ b/doc/manual/team.rst
@@ -158,11 +158,11 @@ which problems you attempted and solved. Via the menu you can view the public
 scoreboard page with the scores of all teams. Many cells will show
 additional "title text" information when hovering over them. The
 score column lists the number of solved problems and the total time including
-penalty time. Each cell in a problem column lists the number of submissions,
-and if the problem was solved, the time of the first correct
-submission in minutes since contest start. This is included in your
-total time together with any penalty time incurred for previous
-incorrect submissions.
+penalty time, the first team to solve the problem will be in dark green. Each
+cell in a problem column lists the number of submissions, and if the problem
+was solved, the time of the first correct submission in minutes since contest
+start. This is included in your total time together with any penalty time
+incurred for previous incorrect submissions.
 
 Optionally the scoreboard can be 'frozen' some time before the end of the
 contest. The full scoreboard view will not be updated anymore, but your
@@ -261,6 +261,8 @@ your program).
 On the contest control system your program enters a queue, awaiting compilation,
 execution and testing on one of the autojudges.
 
+Beware that if you submit multiple times in a short time interval the DOMjudge will determine which submission to judge based on both the submission time and how many other submission you have in queue to penalize spamming.
+
 Compilation
 ```````````
 
@@ -292,6 +294,12 @@ statements which do not have unique output (e.g. with floating point
 answers), the system may use a modified comparison function.
 This will be documented in the problem description.
 
+DOMjudge will run your submissions on the test cases in a deterministic
+order, i.e. if your program fails on the fourth case with wrong answer
+and on the fifth case with run error, DOMjudge will report wrong
+answer. It will not report the number of the test case that failed.
+
+
 .. _runlimits:
 
 Restrictions
@@ -410,6 +418,8 @@ for different programming languages.
 Improvements to DOMjudge
 ------------------------
 
-The DOMjudge team would like your feedback. We do not receive much feedback from participants.
-If you find something lacking or have improvement ideas, please report them. See https://www.domjudge.org/development.
+The DOMjudge team would like your feedback. We do not
+receive much feedback from participants. If you find
+something lacking or have improvement ideas, please report
+them. See https://www.domjudge.org/development.
 
diff --git a/etc/db-config.yaml b/etc/db-config.yaml
index 665a48a6e8..9746b9ba15 100644
--- a/etc/db-config.yaml
+++ b/etc/db-config.yaml
@@ -186,6 +186,12 @@
             default_value:
                 - No comment.
                 - Read the problem statement carefully.
+                - The hardware of the machines evaluating your submissions is identical to the team machines.
+                  They run the same operating system and base image but are tuned to make submission run times
+                  more consistent, for example we pin your submission to one core.
+                - DOMjudge does not define any special macros like ONLINE_JUDGE.
+                - For interactive problems, only your code runs inside of the sandbox and other processes
+                  including the interactive problem interactor do not count towards memory or time limits for the submission.
             public: false
             description: List of pre-defined clarification answers.
         -   name: clar_queues