diff --git a/faq.html b/faq.html
index f366306a0..65ee7b1a5 100644
--- a/faq.html
+++ b/faq.html
@@ -651,48 +651,85 @@ your entry and then re-run the mkiocccentry tool.
remarks.md file.
See also Rule 17!
The following steps should be taken:
-First, open the web page in your browser. It should look something like this:
+The following steps should be taken, in order to upload your mkiocccentry xz
+compressed tarball, to change the file (if you need to upload a different file
+or you have updated the submission), and to check the status of it after the
+contest closes:
First, open the web page in your browser. It should look like this: +With the login id and password already input, It should look something like +this:

At this point, using the UUID login and the password you were provided with step -0, log in. Assuming everything is fine, you should see something like:
-
The login is the UUID you were provided when you registered for the IOCCC and +the password is the initial password you were provided with. Click “Login”. +Assuming everything is fine, it should look something like:
+
At this point you should change your password. Once this is done, you will have -to log in again:
+ width=710 height=808> +As you can see, you have to change your password. Put in your login (UUID +username), your old (initial) password and a new password. For instance:
+
Click “Change Password”.
+Once this is done, you will have to log in again. Using the UUID login and the +new password:

At this point, enter your UUID login and new password, and then click “Login”. -You will see submit slots. Each slot is for one submission so if you update a -submission, make sure you choose the right one so you do not overwrite the wrong -one. In this next screenshot you will see slot 0 is already -selected:
+ width=710 height=344> +.. click “Login”.
+Once you’ve logged in, you will see submit slots. Each slot is for one +submission so if you update a submission, make sure you choose the right one so +you do not overwrite the wrong one!
+Here is what it looks like without any uploads and no slot selected:

Further down the page you should see something like:
-
Click the link to upload your mkiocccentry compressed tarball. For instance:

Click “Submit”. Once it’s uploaded, you should be presented with a new screen. -If you chose slot 0 you might see something like:
+ alt="submit server slots" + width=710 height=806> +Select a slot and then select a file by clicking the button “Choose File”. After +doing this, it should look something like:
+
If you need to change the file to upload, you can mouseover the file and click +it. If you wait a moment it’ll show the current filename. It will look something +like this:
+
Once you’re certain you have selected the correct file, click “Submit”, below +the file selection step.
+When it’s uploaded it should look something like this:

After the submission deadline is reached, and after the judges have verified -that your submission is valid (as in passes the tools checks), you should see -something like this:
+ alt="submit server submission uploaded" + width=717 height=525> +Here you see the details, in particular:
+mkiocccentry(1) which is HIGHLY recommended so that you do not break Rule
+17!txzchk(1) will also verify (the file itself and the
+tarball listing)Now if you’re done, log out.
+After the submission deadline is reached, you can log in to check the status of
+your submissions. Here is what it will look like when the judges have verified
+that your tarball / submission has been validated (NOT judged), by txzchk(1)
+and chkentry(1).:

For details on txzchk, see the
+FAQ on “txzchk”.
For details on chkentry, see the
+FAQ on “chkentry”.
If you need more information on what chkentry checks, see the
+FAQ on the “.info.json file”
+and the
+FAQ on the “.auth.json file”.
Jump to: top
+ width=710 height=562>
-At this point, using the UUID login and the password you were provided with step
-0, log in. Assuming everything is fine, you should see something like:
+The login is the UUID you were provided when you registered for the IOCCC and
+the password is the initial password you were provided with. Click "Login".
+Assuming everything is fine, it should look something like:
-
+ width=710 height=808>
-At this point you should change your password. Once this is done, you will have
-to log in again:
+As you can see, you have to change your password. Put in your login (UUID
+username), your old (initial) password and a new password. For instance:
+
+
+
+Click "Change Password".
+
+Once this is done, you will have to log in again. Using the UUID login and the
+new password:
+ width=710 height=344>
-At this point, enter your UUID login and new password, and then click "Login".
-You will see submit slots. Each slot is for one submission so if you update a
-submission, make sure you choose the right one so you do not overwrite the wrong
-one. In this next screenshot you will see slot 0 is already
-selected:
+
+.. click "Login".
+
+Once you've logged in, you will see submit slots. Each slot is for one
+submission so if you update a submission, make sure you choose the right one so
+you do not overwrite the wrong one!
+
+Here is what it looks like without any uploads and no slot selected:
+ alt="submit server slots"
+ width=710 height=806>
-Further down the page you should see something like:
+Select a slot and then select a file by clicking the button "Choose File". After
+doing this, it should look something like:
+
-
+If you need to change the file to upload, you can mouseover the file and click
+it. If you wait a moment it'll show the current filename. It will look something
+like this:
-Click the link to upload your `mkiocccentry` compressed tarball. For instance:
+
-
+Once you're certain you have selected the correct file, click "Submit", below
+the file selection step.
-Click "Submit". Once it's uploaded, you should be presented with a new screen.
-If you chose slot 0 you might see something like:
+When it's uploaded it should look something like this:
+ alt="submit server submission uploaded"
+ width=717 height=525>
-After the submission deadline is reached, and after the judges have verified
-that your submission is valid (as in passes the tools checks), you should see
-something like this:
+Here you see the details, in particular:
+
+- the status of the submission
+- the filename, which will be in the correct format, assuming you used
+`mkiocccentry(1)` which is **HIGHLY** recommended so that you do not break [Rule
+17](next/rules.html#rule17)!
+- the file length, which `txzchk(1)` will also verify (the file itself and the
+tarball listing)
+- the upload date
+- the SHA256 hash of the file
+
+Now if you're done, log out.
+
+After the submission deadline is reached, you can log in to check the status of
+your submissions. Here is what it will look like when the judges have verified
+that your tarball / submission has been validated (NOT judged), by `txzchk(1)`
+and `chkentry(1)`.:
+ alt="submit server status updated"
+ width=717 height=217>
+
+For details on `txzchk`, see the
+FAQ on "[txzchk](#txzchk)".
+
+For details on `chkentry`, see the
+FAQ on "[chkentry](#chkentry)".
+
+If you need more information on what `chkentry` checks, see the
+FAQ on the [".info.json file](#info_json)"
+and the
+FAQ on the "[.auth.json file](#auth_json)".
Jump to: [top](#)
diff --git a/png/submit-server-change-file.png b/png/submit-server-change-file.png
new file mode 100644
index 000000000..d6b2ce0ae
Binary files /dev/null and b/png/submit-server-change-file.png differ
diff --git a/png/submit-server-change-passwd.png b/png/submit-server-change-passwd.png
new file mode 100644
index 000000000..c77b3b82d
Binary files /dev/null and b/png/submit-server-change-passwd.png differ
diff --git a/png/submit-server-file-selected.png b/png/submit-server-file-selected.png
deleted file mode 100644
index 0d6fd5468..000000000
Binary files a/png/submit-server-file-selected.png and /dev/null differ
diff --git a/png/submit-server-first-login.png b/png/submit-server-first-login.png
new file mode 100644
index 000000000..c4e0bb01f
Binary files /dev/null and b/png/submit-server-first-login.png differ
diff --git a/png/submit-server-login.png b/png/submit-server-login.png
index 97fda840e..07387b225 100644
Binary files a/png/submit-server-login.png and b/png/submit-server-login.png differ
diff --git a/png/submit-server-passwd-changed.png b/png/submit-server-passwd-changed.png
index 4ad2a89c3..20c159c24 100644
Binary files a/png/submit-server-passwd-changed.png and b/png/submit-server-passwd-changed.png differ
diff --git a/png/submit-server-passwd.png b/png/submit-server-passwd.png
deleted file mode 100644
index 0cf8c3e2a..000000000
Binary files a/png/submit-server-passwd.png and /dev/null differ
diff --git a/png/submit-server-slot-file.png b/png/submit-server-slot-file.png
new file mode 100644
index 000000000..0e1be197d
Binary files /dev/null and b/png/submit-server-slot-file.png differ
diff --git a/png/submit-server-slots.png b/png/submit-server-slots.png
index 02e88b05f..d7bf59974 100644
Binary files a/png/submit-server-slots.png and b/png/submit-server-slots.png differ
diff --git a/png/submit-server-status-updated.png b/png/submit-server-status-updated.png
index d4db3b525..42c30bb52 100644
Binary files a/png/submit-server-status-updated.png and b/png/submit-server-status-updated.png differ
diff --git a/png/submit-server-submission-uploaded.png b/png/submit-server-submission-uploaded.png
index d8adbb2ec..b6c5d2307 100644
Binary files a/png/submit-server-submission-uploaded.png and b/png/submit-server-submission-uploaded.png differ