diff --git a/LICENSE b/LICENSE
index 243f69d..888da28 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2016, Avi Halachmi (:avih)
+Copyright (C) 2016, Avi Halachmi
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/README.md b/README.md
index 87c0567..47d2a1a 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,39 @@
 # dejsonlz4
-Decompressor for Mozilla/Firefox bookmark backup files
+Decompress Mozilla Firefox bookmarks backup files
 
-Mozilla Firefox currently uses unofficial lz4 compression for bookmark backup files,
-and `dejsonlz4` can currently be used to decompress them. These files have an extension `.jsonlz4`.
+Current Firefox bookmarks backup files are stored as non-standard file format
+based on lz4 compression. These files have a `.jsonlz4` extension. Use
+`dejsonlz4` to decompress them.
 
-This repository includes verbatim copies of `lz4.c` and `lz4.h` from the Mozilla repository
-as of 2016-05-16 (as currently used by Firefox).
+`lz4.c` and `lz4.h` at this repository are verbatim copies from the Mozilla
+repository as of 2016-05-12 (as currently used by Firefox) [1].
 
 ## Usage:
 ```
 Usage: dejsonlz4 [-h] IN_FILE [OUT_FILE]
-   -h: Display this help and exit.
-Decompress Mozilla bookmark backup file IN_FILE to OUT_FILE.
-If OUT_FILE is not provided or is '-' then decompress to standard output.
+   -h  Display this help and exit.
+Decompress Mozilla bookmarks backup file IN_FILE to OUT_FILE.
+If OUT_FILE is '-' or missing, decompress to standard output.
 ```
 
 ## Build:
 - `gcc -Wall -o dejsonlz4 dejsonlz4.c lz4.c`
 
 ## Windows note:
-- `dejsonlz4` currently does not support unicode file names, for the sake of simpler code.
+- `dejsonlz4` on Windows does not support unicode path/file names at this time.
+
+## References:
+- Project page and source files: https://github.com/avih/dejsonlz4
+- Releases and binary builds for Windows: https://github.com/avih/dejsonlz4/releases
+
+### External resources:
+- Mozilla Firefox
+[bug 818587]( https://bugzilla.mozilla.org/show_bug.cgi?id=818587 ) - Compress
+bookmark backups.
+- Mozilla Firefox
+[bug 1209390]( https://bugzilla.mozilla.org/show_bug.cgi?id=1209390 ) - Use
+standard lz4 file format instead of the non-standard jsonlz4/mozlz4.
+
+[1] Mozilla's mercurial repo rev. c3f5e6079284:
+[lz4.h]( http://hg.mozilla.org/mozilla-central/file/c3f5e6079284/mfbt/lz4.h )
+and [lz4.c]( http://hg.mozilla.org/mozilla-central/file/c3f5e6079284/mfbt/lz4.c )
diff --git a/src/dejsonlz4.c b/src/dejsonlz4.c
index 589ca08..7c54aad 100644
--- a/src/dejsonlz4.c
+++ b/src/dejsonlz4.c
@@ -1,5 +1,5 @@
 /*
-   dejsonlz4 - Decompress Mozilla bookmark backup files
+   dejsonlz4 - Decompress Mozilla bookmarks backup files
    Copyright (C) 2016, Avi Halachmi
    BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
 
@@ -32,7 +32,7 @@
 
 /*
    lz4.c and lz4.h are verbatim copies from Mozilla source tree mfbt/lz4.*
-   (Mercurial) rev: c3f5e6079284 (2016-05-16) and carry their own license.
+   (Mercurial) rev: c3f5e6079284 (2016-05-12) and carry their own license.
 */
 
 /* Build: gcc -Wall -o dejsonlz4 dejsonlz4.c lz4.c */
@@ -50,9 +50,9 @@ const int decomp_size = 4;  /* 4 bytes size come after the header */
 void exit_usage(int code) {
     fprintf((code ? stderr : stdout), "%s",
             "Usage: dejsonlz4 [-h] IN_FILE [OUT_FILE]\n"
-            "   -h: Display this help and exit.\n"
+            "   -h  Display this help and exit.\n"
             "Decompress Mozilla bookmarks backup file IN_FILE to OUT_FILE.\n"
-            "If OUT_FILE is missing or is '-' then decompress to standard output.\n"
+            "If OUT_FILE is '-' or missing, decompress to standard output.\n"
            );
     exit(code);
 }