diff --git a/README.md b/README.md
index 6a3f07f..fa5a5f4 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ protocol more accessible, while maintaining full alignment with all relevant
 and useful RFCs.
 
 This effort is developed cooperatively on GitHub, the repository can be
-found [https://github.com/ahupowerdns/hello-dns/](here) and help is highly
+found [https://github.com/Habbie/hello-dns/](here) and help is highly
 welcome!  Feedback can also be sent to bert.hubert@powerdns.com or
 [@PowerDNS_Bert](https://twitter.com/PowerDNS_Bert).
 
diff --git a/basic.md b/basic.md
index a8cfb1e..06f087a 100644
--- a/basic.md
+++ b/basic.md
@@ -150,7 +150,7 @@ save a lot of pain when processing DNS names with spaces or dots in them.
 Finally, DNS queries are
 [case-insensitive](https://tools.ietf.org/html/rfc4343).  This however is
 defined rather mechanically, and limited to ASCII.  Operators do not need to know that in some
-encodings a Ü is equivalent to ü when compared case insensitively.
+encodings a Ü is equivalent to ü when compared case-insensitively.
 For DNS purposes, the fifth bit (0x20) is ignored when comparing octets
 within a-z and A-Z.
 
@@ -274,7 +274,7 @@ This is then followed by the binary representation of the current IPv6
 address of www.ietf.org, 2400:cb00:2048:1::6814:55.
 
 If there had been further answers, these would follow this first one, and
-the ANCOUNT would have been higher than 1. If there had been data in the
+the ANCOUNT would have been greater than 1. If there had been data in the
 'authoritative' and 'additional' sections, that would follow here too, with
 the corresponding adjustments to 'NSCOUNT' and 'ARCOUNT' fields. More about
 these sections later.
diff --git a/optional.md b/optional.md
index 5373530..b8d189d 100644
--- a/optional.md
+++ b/optional.md
@@ -111,7 +111,7 @@ Prerequisites are constraints that must pass before any updates are processed.
 All of the constraints apply to entire RRSETs as opposed to individual RRs.
 Prerequisite failures are signalled by a response message's RCODE.
 
-Prerequiste            | Type         | Class         | Data | Failure RCODE
+Prerequisite           | Type         | Class         | Data | Failure RCODE
 -----------------------|--------------|---------------|------|--------------
 RRSET exists           | RRSET's Type | ANY (255)     | No   | NXRRSET (8)
 RRSET exists with data | RRSET's Type | RRSET's Class | Yes  | NXRRSET (8)
diff --git a/resolver.md b/resolver.md
index 8a5084d..9a3214d 100644
--- a/resolver.md
+++ b/resolver.md
@@ -90,7 +90,7 @@ and terminate the algorithm.
 
 # Security
 At every point a resolver must be vigilant to not store data coming from an
-authoritative server that can not be trusted to provide that data.
+authoritative server that cannot be trusted to provide that data.
 
 In addition, if a cache is used, care must be taken that an authoritative
 server must not be allowed to 'extend its own authority' infinitely. This is
diff --git a/tdns/Doxyfile b/tdns/Doxyfile
index 2e0a132..1c4c105 100644
--- a/tdns/Doxyfile
+++ b/tdns/Doxyfile
@@ -204,7 +204,7 @@ QT_AUTOBRIEF           = NO
 # tag to YES if you prefer the old behavior instead.
 #
 # Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
+# not recognized anymore.
 # The default value is: NO.
 
 MULTILINE_CPP_IS_BRIEF = NO
@@ -278,7 +278,7 @@ OPTIMIZE_OUTPUT_VHDL   = NO
 # parses. With this tag you can assign which parser to use for a given
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
 # C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
 # FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
 # Fortran. In the later case the parser tries to guess whether the code is fixed
@@ -520,7 +520,7 @@ INTERNAL_DOCS          = NO
 # If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
+# in case and if your file system supports case-sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
@@ -685,7 +685,7 @@ SHOW_NAMESPACES        = YES
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # doxygen should invoke to get the current version for each file (typically from
 # the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
+# popen()) the command input-file, where command is the value of the
 # FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
 # by doxygen. Whatever the program writes to standard output is used as the file
 # version. For an example see the documentation.
@@ -1512,7 +1512,7 @@ EXT_LINKS_IN_WINDOW    = NO
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
 # generated for formulas are transparent PNGs. Transparent PNGs are not
 # supported properly for IE 6.0, but are supported on all modern browsers.
 #
@@ -1524,7 +1524,7 @@ FORMULA_FONTSIZE       = 10
 FORMULA_TRANSPARENT    = YES
 
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
+# http://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1594,7 +1594,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/tdns/README.md b/tdns/README.md
index a8b9cb9..9ebb7a3 100644
--- a/tdns/README.md
+++ b/tdns/README.md
@@ -9,7 +9,7 @@ Welcome to tdns, a 'from scratch' teaching DNS library.  Based on `tdns`,
 [`tauth`](tauth.md.html) and [`tres`](tres.md.html) implement all of [basic
 DNS](../basic.md.html) and large parts of DNSSEC in ~~2000~~ ~~3000~~ 3100
 lines of code.  Code is
-[here](https://github.com/ahupowerdns/hello-dns/tree/master/tdns).  To
+[here](https://github.com/Habbie/hello-dns/tree/master/tdns).  To
 compile, see the end of this document.
 
 Even though the 'hello-dns' documents describe how basic DNS works, and how
@@ -40,13 +40,13 @@ Non-goals are:
 A more narrative explanation of what `tdns` is and what we hope it will
 achieve can be found [here](intro.md.html).
 
-The code for `tdns` can be found on [GitHub](https://github.com/ahupowerdns/hello-dns/blob/master/tdns/) and is also documented 
+The code for `tdns` can be found on [GitHub](https://github.com/Habbie/hello-dns/blob/master/tdns/) and is also documented 
 using [Doxygen](codedocs/html).
 
 # Objects in `tdns`
-These are found in [dns-storage.hh](https://github.com/ahupowerdns/hello-dns/blob/master/tdns/dns-storage.hh)
+These are found in [dns-storage.hh](https://github.com/Habbie/hello-dns/blob/master/tdns/dns-storage.hh)
 and
-[dns-storage.cc](https://github.com/ahupowerdns/hello-dns/blob/master/tdns/dns-storage.hh).
+[dns-storage.cc](https://github.com/Habbie/hello-dns/blob/master/tdns/dns-storage.hh).
 
 ## DNSLabel
 The most basic object in `tdns` is DNSLabel. `www.powerdns.com` consists of
@@ -206,8 +206,8 @@ has a `toString()` method for human friendly output.
 
 
 # Parsing and generating DNS Messages
-This code is in [dnsmessages.cc](https://github.com/ahupowerdns/hello-dns/blob/master/tdns/dnsmessages.cc)
-and [dnsmessages.hh](https://github.com/ahupowerdns/hello-dns/blob/master/tdns/dnsmessages.hh).
+This code is in [dnsmessages.cc](https://github.com/Habbie/hello-dns/blob/master/tdns/dnsmessages.cc)
+and [dnsmessages.hh](https://github.com/Habbie/hello-dns/blob/master/tdns/dnsmessages.hh).
 
 ## `RRGen`s: dealing with all the record types
 DNS knows many record types, so we need a unified interface that can pass
@@ -270,7 +270,7 @@ returns record details and a smart pointer to an `RRGen` instance (as
 described above). 
 
 A good example of how `DNSMessageReader` works can be found in
-[`tdig.cc`](https://github.com/ahupowerdns/hello-dns/blob/master/tdns/dns-storage.hh).
+[`tdig.cc`](https://github.com/Habbie/hello-dns/blob/master/tdns/dns-storage.hh).
 
 ## DNSMessageWriter
 This class creates DNS messages, and in its constructor it needs to know the
@@ -293,9 +293,9 @@ Writing actual records to DNSMessageWriter proceeds via `putRR()` which
 serializes `RRGen` instances to the message.
 
 Samples of how to do this can be found in
-[tres.cc](https://github.com/ahupowerdns/hello-dns/blob/master/tdns/dns-storage.hh)
+[tres.cc](https://github.com/Habbie/hello-dns/blob/master/tdns/dns-storage.hh)
 and
-[tauth.cc](https://github.com/ahupowerdns/hello-dns/blob/master/tdns/dns-storage.hh).
+[tauth.cc](https://github.com/Habbie/hello-dns/blob/master/tdns/dns-storage.hh).
 
 ### Compression
 DNS compression is unreasonably difficult to get right. In what happens to
@@ -322,7 +322,7 @@ this in `serialize()`.
 # Internals
 `tdns` uses several small pieces of code not core to dns:
 
- * [nenum](https://github.com/ahupowerdns/hello-dns/blob/master/tdns/nenum.hh)
+ * [nenum](https://github.com/Habbie/hello-dns/blob/master/tdns/nenum.hh)
    this is a simple 'named ENUM' construct that enables the printing of
    DNSName::A
  * [Simplesocket](https://github.com/ahupowerdns/simplesocket) a small set
@@ -334,7 +334,7 @@ This requires a recent compiler version that supports C++ 2014. If you
 encounter problems, please let me know (see above for address details).
 
 ```
-$ git clone https://github.com/ahupowerdns/hello-dns.git
+$ git clone https://github.com/Habbie/hello-dns.git
 $ cd hello-dns/tdns
 $ git submodule init
 $ git submodule update
@@ -344,7 +344,7 @@ $ dig -t any time.powerdns.org @::1 -p 5300 +short
 time.powerdns.org.	3600	IN	TXT	"The time is Fri, 13 Apr 2018 12:55:54 +0200"
 ```
 
-For more detauls, read on about [`tauth`](tauth.md.html), [`tres`](tres.md.html)
+For more details, read on about [`tauth`](tauth.md.html), [`tres`](tres.md.html)
 or the [C API](c-api.md.html).
 
 <script>
diff --git a/tdns/c-api.md b/tdns/c-api.md
index 916ce3f..569f007 100644
--- a/tdns/c-api.md
+++ b/tdns/c-api.md
@@ -47,7 +47,7 @@ An error is indicated by a non-zero return value, in which case the error is
 available through `TDNSErrorMessage`.
 
 Actual IP addresses, IPv4 or IPv6, are returned as `struct sockaddr_storage` 
-pointers in `TDNSIpAddressess::addresses`:
+pointers in `TDNSIpAddresses::addresses`:
 
 ```
   for(int n = 0; ips->addresses[n]; ++n) {
@@ -61,7 +61,7 @@ pointers in `TDNSIpAddressess::addresses`:
   }
   freeTDNSIPAddresses(ips);
 ```
-The sequence is terminated by a 0 pointer in `addressses`. Note that the
+The sequence is terminated by a 0 pointer in `addresses`. Note that the
 answer must also be freed with `freeTDNSIPAddresses`.
 
 ## MX Records
@@ -98,7 +98,7 @@ And TXT records:
 
 # Full code
 The full code of these examples can be found on
-[GitHub](https://github.com/ahupowerdns/hello-dns/blob/master/tdns/tdns-c-test.c).
+[GitHub](https://github.com/Habbie/hello-dns/blob/master/tdns/tdns-c-test.c).
 
 <script>
 window.markdeepOptions={};
diff --git a/tdns/dns-storage.hh b/tdns/dns-storage.hh
index 514bbc5..97d0537 100644
--- a/tdns/dns-storage.hh
+++ b/tdns/dns-storage.hh
@@ -102,7 +102,7 @@ public:
     if(d_s.size() > 63)
       throw std::out_of_range("label too long");
   }
-  //! Equality and comparison are case insensitive
+  //! Equality and comparison are case-insensitive
   bool operator<(const DNSLabel& rhs) const
   {
     return std::lexicographical_compare(d_s.begin(), d_s.end(), rhs.d_s.begin(), rhs.d_s.end(), charcomp);
@@ -208,7 +208,7 @@ struct DNSNode
   DNSNode(){}
   DNSNode(const DNSLabel& lab, DNSNode* parent) : d_name(lab), d_parent(parent) {}
   ~DNSNode();
-  //! This is the key function that finds names, returns where it found them and if any zonecuts were passsed
+  //! This is the key function that finds names, returns where it found them and if any zonecuts were passed
   const DNSNode* find(DNSName& name, DNSName& last, bool wildcards=false, const DNSNode** passedZonecut=0, const DNSNode** passedWcard=0) const;
 
   //! This is an idempotent way to add a node to a DNS tree
diff --git a/tdns/ext/catch/catch.hpp b/tdns/ext/catch/catch.hpp
index ecd8907..40a7103 100644
--- a/tdns/ext/catch/catch.hpp
+++ b/tdns/ext/catch/catch.hpp
@@ -2432,7 +2432,7 @@ class PredicateMatcher : public MatcherBase<T> {
 
     // The following functions create the actual matcher objects.
     // The user has to explicitly specify type to the function, because
-    // infering std::function<bool(T const&)> is hard (but possible) and
+    // inferring std::function<bool(T const&)> is hard (but possible) and
     // requires a lot of TMP.
     template<typename T>
     Generic::PredicateMatcher<T> Predicate(std::function<bool(T const&)> const& predicate, std::string const& description = "") {
@@ -8043,7 +8043,7 @@ namespace Matchers {
         }
         std::string CasedString::caseSensitivitySuffix() const {
             return m_caseSensitivity == CaseSensitive::No
-                   ? " (case insensitive)"
+                   ? " (case-insensitive)"
                    : std::string();
         }
 
@@ -8100,7 +8100,7 @@ namespace Matchers {
         }
 
         std::string RegexMatcher::describe() const {
-            return "matches " + ::Catch::Detail::stringify(m_regex) + ((m_caseSensitivity == CaseSensitive::Choice::Yes)? " case sensitively" : " case insensitively");
+            return "matches " + ::Catch::Detail::stringify(m_regex) + ((m_caseSensitivity == CaseSensitive::Choice::Yes)? " case-sensitively" : " case-insensitively");
         }
 
     } // namespace StdString
diff --git a/tdns/ext/nlohmann/json.hpp b/tdns/ext/nlohmann/json.hpp
index 1e7cf51..34be8a5 100644
--- a/tdns/ext/nlohmann/json.hpp
+++ b/tdns/ext/nlohmann/json.hpp
@@ -850,7 +850,7 @@ Exceptions have ids 1xx.
 name / id                      | example message | description
 ------------------------------ | --------------- | -------------------------
 json.exception.parse_error.101 | parse error at 2: unexpected end of input; expected string literal | This error indicates a syntax error while deserializing a JSON text. The error message describes that an unexpected token (character) was encountered, and the member @a byte indicates the error position.
-json.exception.parse_error.102 | parse error at 14: missing or wrong low surrogate | JSON uses the `\uxxxx` format to describe Unicode characters. Code points above above 0xFFFF are split into two `\uxxxx` entries ("surrogate pairs"). This error indicates that the surrogate pair is incomplete or contains an invalid code point.
+json.exception.parse_error.102 | parse error at 14: missing or wrong low surrogate | JSON uses the `\uxxxx` format to describe Unicode characters. Code points above 0xFFFF are split into two `\uxxxx` entries ("surrogate pairs"). This error indicates that the surrogate pair is incomplete or contains an invalid code point.
 json.exception.parse_error.103 | parse error: code points above 0x10FFFF are invalid | Unicode supports code points up to 0x10FFFF. Code points above 0x10FFFF are invalid.
 json.exception.parse_error.104 | parse error: JSON patch must be an array of objects | [RFC 6902](https://tools.ietf.org/html/rfc6902) requires a JSON Patch document to be a JSON document that represents an array of objects.
 json.exception.parse_error.105 | parse error: operation must have string member 'op' | An operation of a JSON Patch document must contain exactly one "op" member, whose value indicates the operation to perform. Its value must be one of "add", "remove", "replace", "move", "copy", or "test"; other values are errors.
@@ -1046,7 +1046,7 @@ json.exception.out_of_range.401 | array index 3 is out of range | The provided a
 json.exception.out_of_range.402 | array index '-' (3) is out of range | The special array index `-` in a JSON Pointer never describes a valid element of the array, but the index past the end. That is, it can only be used to add elements at this position, but not to read it.
 json.exception.out_of_range.403 | key 'foo' not found | The provided key was not found in the JSON object.
 json.exception.out_of_range.404 | unresolved reference token 'foo' | A reference token in a JSON Pointer could not be resolved.
-json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' can not be applied to the root element of the JSON value.
+json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' cannot be applied to the root element of the JSON value.
 json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF.
 json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. |
 json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. |
@@ -1166,7 +1166,7 @@ enum class value_t : std::uint8_t
     number_integer,   ///< number value (signed integer)
     number_unsigned,  ///< number value (unsigned integer)
     number_float,     ///< number value (floating-point)
-    discarded         ///< discarded by the the parser callback function
+    discarded         ///< discarded by the parser callback function
 };
 
 /*!
@@ -6454,7 +6454,7 @@ class binary_reader
 
     @note from http://stackoverflow.com/a/1001328/266378
     */
-    static constexpr bool little_endianess(int num = 1) noexcept
+    static constexpr bool little_endianness(int num = 1) noexcept
     {
         return (*reinterpret_cast<char*>(&num) == 1);
     }
@@ -8167,7 +8167,7 @@ class binary_reader
 
     @return whether conversion completed
 
-    @note This function needs to respect the system's endianess, because
+    @note This function needs to respect the system's endianness, because
           bytes in CBOR, MessagePack, and UBJSON are stored in network order
           (big endian) and therefore need reordering on little endian systems.
     */
@@ -8210,7 +8210,7 @@ class binary_reader
 
     @return whether string creation completed
 
-    @note We can not reserve @a len bytes for the result, because @a len
+    @note We cannot reserve @a len bytes for the result, because @a len
           may be too large. Usually, @ref unexpect_eof() detects the end of
           the input before we run out of string memory.
     */
@@ -8306,8 +8306,8 @@ class binary_reader
     /// the number of characters read
     std::size_t chars_read = 0;
 
-    /// whether we can assume little endianess
-    const bool is_little_endian = little_endianess();
+    /// whether we can assume little endianness
+    const bool is_little_endian = little_endianness();
 
     /// the SAX parser
     json_sax_t* sax = nullptr;
@@ -9586,7 +9586,7 @@ class binary_writer
     @tparam OutputIsLittleEndian Set to true if output data is
                                  required to be little endian
 
-    @note This function needs to respect the system's endianess, because bytes
+    @note This function needs to respect the system's endianness, because bytes
           in CBOR, MessagePack, and UBJSON are stored in network order (big
           endian) and therefore need reordering on little endian systems.
     */
@@ -9649,8 +9649,8 @@ class binary_writer
     }
 
   private:
-    /// whether we can assume little endianess
-    const bool is_little_endian = binary_reader<BasicJsonType>::little_endianess();
+    /// whether we can assume little endianness
+    const bool is_little_endian = binary_reader<BasicJsonType>::little_endianness();
 
     /// the output
     output_adapter_t<CharType> oa = nullptr;
@@ -9952,7 +9952,7 @@ boundaries compute_boundaries(FloatType value)
 //              = p1 + p2 * 2^e
 //
 // The conversion of p1 into decimal form requires a series of divisions and
-// modulos by (a power of) 10. These operations are faster for 32-bit than for
+// modulo by (a power of) 10. These operations are faster for 32-bit than for
 // 64-bit integers, so p1 should ideally fit into a 32-bit integer. This can be
 // achieved by choosing
 //
@@ -10005,7 +10005,7 @@ inline cached_power get_cached_power_for_binary_exponent(int e)
     //      ==> 2^(q - 1 + alpha) <= c * 2^(e + q)
     //      ==> 2^(alpha - e - 1) <= c
     //
-    // If c were an exakt power of ten, i.e. c = 10^k, one may determine k as
+    // If c were an exact power of ten, i.e. c = 10^k, one may determine k as
     //
     //      k = ceil( log_10( 2^(alpha - e - 1) ) )
     //        = ceil( (alpha - e - 1) * log_10(2) )
@@ -11797,7 +11797,7 @@ class json_pointer
 
     @throw parse_error.106   if an array index begins with '0'
     @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.404  if the JSON pointer can not be resolved
+    @throw out_of_range.404  if the JSON pointer cannot be resolved
     */
     BasicJsonType& get_unchecked(BasicJsonType* ptr) const
     {
@@ -11873,7 +11873,7 @@ class json_pointer
     @throw parse_error.106   if an array index begins with '0'
     @throw parse_error.109   if an array index was not a number
     @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
+    @throw out_of_range.404  if the JSON pointer cannot be resolved
     */
     BasicJsonType& get_checked(BasicJsonType* ptr) const
     {
@@ -11938,7 +11938,7 @@ class json_pointer
     @throw parse_error.106   if an array index begins with '0'
     @throw parse_error.109   if an array index was not a number
     @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
+    @throw out_of_range.404  if the JSON pointer cannot be resolved
     */
     const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const
     {
@@ -11997,7 +11997,7 @@ class json_pointer
     @throw parse_error.106   if an array index begins with '0'
     @throw parse_error.109   if an array index was not a number
     @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
+    @throw out_of_range.404  if the JSON pointer cannot be resolved
     */
     const BasicJsonType& get_checked(const BasicJsonType* ptr) const
     {
@@ -13865,7 +13865,7 @@ class basic_json
     the range `[first, last)` is undefined.
     @throw invalid_iterator.204 if iterators @a first and @a last belong to a
     primitive type (number, boolean, or string), but @a first does not point
-    to the first element any more. In this case, the range `[first, last)` is
+    to the first element anymore. In this case, the range `[first, last)` is
     undefined. See example code below.
     @throw invalid_iterator.206 if iterators @a first and @a last belong to a
     null value. In this case, the range `[first, last)` is undefined.
@@ -17451,7 +17451,7 @@ class basic_json
 
     @throw type_error.309 if called on JSON values other than objects; example:
     `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if iterator @a first or @a last does does not
+    @throw invalid_iterator.202 if iterator @a first or @a last does not
     point to an object; example: `"iterators first and last must point to
     objects"`
     @throw invalid_iterator.210 if @a first and @a last do not belong to the
@@ -17534,7 +17534,7 @@ class basic_json
     /*!
     @brief updates a JSON object from another object, overwriting existing keys
 
-    Inserts all values from from range `[first, last)` and overwrites existing
+    Inserts all values from range `[first, last)` and overwrites existing
     keys.
 
     @param[in] first begin of the range of elements to insert
@@ -17542,7 +17542,7 @@ class basic_json
 
     @throw type_error.312 if called on JSON values other than objects; example:
     `"cannot use update() with string"`
-    @throw invalid_iterator.202 if iterator @a first or @a last does does not
+    @throw invalid_iterator.202 if iterator @a first or @a last does not
     point to an object; example: `"iterators first and last must point to
     objects"`
     @throw invalid_iterator.210 if @a first and @a last do not belong to the
@@ -19403,7 +19403,7 @@ class basic_json
 
     @throw parse_error.106   if an array index begins with '0'
     @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.404  if the JSON pointer can not be resolved
+    @throw out_of_range.404  if the JSON pointer cannot be resolved
 
     @liveexample{The behavior is shown in the example.,operatorjson_pointer}
 
@@ -19419,7 +19419,7 @@ class basic_json
 
     Uses a JSON pointer to retrieve a reference to the respective JSON value.
     No bound checking is performed. The function does not change the JSON
-    value; no `null` values are created. In particular, the the special value
+    value; no `null` values are created. In particular, the special value
     `-` yields an exception.
 
     @param[in] ptr  JSON pointer to the desired element
@@ -19431,7 +19431,7 @@ class basic_json
     @throw parse_error.106   if an array index begins with '0'
     @throw parse_error.109   if an array index was not a number
     @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
+    @throw out_of_range.404  if the JSON pointer cannot be resolved
 
     @liveexample{The behavior is shown in the example.,operatorjson_pointer_const}
 
@@ -19468,7 +19468,7 @@ class basic_json
     @throw out_of_range.403 if the JSON pointer describes a key of an object
     which cannot be found. See example below.
 
-    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
+    @throw out_of_range.404 if the JSON pointer @a ptr cannot be resolved.
     See example below.
 
     @exceptionsafety Strong guarantee: if an exception is thrown, there are no
@@ -19511,7 +19511,7 @@ class basic_json
     @throw out_of_range.403 if the JSON pointer describes a key of an object
     which cannot be found. See example below.
 
-    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
+    @throw out_of_range.404 if the JSON pointer @a ptr cannot be resolved.
     See example below.
 
     @exceptionsafety Strong guarantee: if an exception is thrown, there are no
@@ -19571,7 +19571,7 @@ class basic_json
     @return the original JSON from a flattened version
 
     @note Empty objects and arrays are flattened by @ref flatten() to `null`
-          values and can not unflattened to their original type. Apart from
+          values and cannot unflattened to their original type. Apart from
           this example, for a JSON value `j`, the following is always true:
           `j == j.flatten().unflatten()`.
 
diff --git a/tdns/intro.md b/tdns/intro.md
index 07d7dd2..c08a9ab 100644
--- a/tdns/intro.md
+++ b/tdns/intro.md
@@ -9,7 +9,7 @@ Note: this page is part of the
 Welcome to tdns, a 'from scratch' teaching authoritative server,
 implementing all of [basic DNS](https://powerdns.org/hello-dns/basic.md.html) in
 ~~1400~~ ~~1500~~ 1600 lines of code.  Code is
-[here](https://github.com/ahupowerdns/hello-dns/tree/master/tdns).  To
+[here](https://github.com/Habbie/hello-dns/tree/master/tdns).  To
 compile, see [here](https://powerdns.org/hello-dns/tdns/README.md.html).
 
 `tdns` is part of the '[hello-dns](https://powerdns.org/hello-dns)' effort
@@ -181,7 +181,7 @@ surprisingly well!
 
 ## Putting the tricky bits at a fundamental level
 DNS names look surprisingly like text strings, but they very much are not. 
-For starters, DNS is case insensitive in its own special way, and such rules
+For starters, DNS is case-insensitive in its own special way, and such rules
 must be obeyed for DNSSEC to ever work.
 
 Furthermore, despite appearances, DNS is 8-bit safe. This means that
@@ -189,7 +189,7 @@ individual DNS labels (usually separated by dots) can contain embedded 0
 characters, but also actual dots themselves.
 
 A lot of code 'up the stack' can be simplified by having basic types that
-are fully DNS native, like DNS Labels which are case insensitive, stored in
+are fully DNS native, like DNS Labels which are case-insensitive, stored in
 binary and length limited by themselves.
 
 Code that uses "strings" for DNS may struggle to recognize (in all places!)
diff --git a/tdns/tauth.cc b/tdns/tauth.cc
index 56d0e47..48292be 100644
--- a/tdns/tauth.cc
+++ b/tdns/tauth.cc
@@ -319,7 +319,7 @@ void udpThread(ComboAddress local, Socket* sock, const DNSNode* zones)
    This function is called to do additional processing on records we encountered 
    earlier that would benefit. This includes MX and NS records.
 
-   Note that this function will only ook within 'bestzone', the best zone we had 
+   Note that this function will only look within 'bestzone', the best zone we had 
    for the original query. This means we will not look at potentially helpful 
    records in other zones. RFCs tell us that resolvers should not use/trust such
    out of zone data anyhow, but no RFC tells us we should not add that data.
diff --git a/tdns/tauth.md b/tdns/tauth.md
index ac1dc76..be19fc3 100644
--- a/tdns/tauth.md
+++ b/tdns/tauth.md
@@ -28,7 +28,7 @@ Known broken:
 
 The code is not quite in a teachable state yet and still contains ugly bits. 
 But well worth [a
-read](https://github.com/ahupowerdns/hello-dns/tree/master/tdns).
+read](https://github.com/Habbie/hello-dns/tree/master/tdns).
 
 # Layout
 Key to a good DNS implementation is having a faithful DNS storage model,
@@ -129,7 +129,7 @@ multiple 'generator' parameters, more about which later.
 www.fra.ietf.org, use `newzone->add({"www", "fra", "ietf", "org"})`.
 
 Within `tdns`, the sample `powerdns.org` zone is populated within
-[contents.cc](https://github.com/ahupowerdns/hello-dns/blob/master/tdns/contents.cc).
+[contents.cc](https://github.com/Habbie/hello-dns/blob/master/tdns/contents.cc).
 
 Finding nodes in the tree uses a slightly more complicated method called
 `find`. Unlike `add` it will not modify the tree, even though it has in
@@ -188,9 +188,9 @@ This attaches SOA, NS and MX records to the apex of a zone, and defines a
 `server1` node that is also referenced in the MX record. 
 
 This code can be found in
-[record-types.cc](https://github.com/ahupowerdns/hello-dns/blob/master/tdns/record-types.cc)
+[record-types.cc](https://github.com/Habbie/hello-dns/blob/master/tdns/record-types.cc)
 and
-[record-types.hh](https://github.com/ahupowerdns/hello-dns/blob/master/tdns/record-types.cc).
+[record-types.hh](https://github.com/Habbie/hello-dns/blob/master/tdns/record-types.cc).
 
 Since there are many record types, it is imperative that adding a new one
 needs to happen in only one place. Within `tauth`, it actually requires two
@@ -238,7 +238,7 @@ packet: the 16 bit priority, followed by the name.
 
 
 ## A bit of fun: dynamic record contents
-Although names can not easily be dynamic within the DNS tree (either they
+Although names cannot easily be dynamic within the DNS tree (either they
 exist or they don't), contents can be changed at will. 
 
 `tdns` defines a `time.tdns.powerdns.org` node which has a `ClockTXTGen`:
@@ -272,7 +272,7 @@ As noted in the [basic DNS](../basic.md.html) and
 algorithm can be simplified for a pure authoritative server.
 
 ## Finding the right zone and node
-In [tdns.cc](https://github.com/ahupowerdns/hello-dns/blob/master/tdns/tdns.cc) , processing starts like this:
+In [tdns.cc](https://github.com/Habbie/hello-dns/blob/master/tdns/tdns.cc) , processing starts like this:
 
 ```
 1	DNSName zonename;
@@ -533,7 +533,7 @@ follows:
 ```
 
 Note: this code, in `tcpClientThread` of
-[tdns.cc](https://github.com/ahupowerdns/hello-dns/blob/master/tdns/record-types.cc)
+[tdns.cc](https://github.com/Habbie/hello-dns/blob/master/tdns/record-types.cc)
 does not yet implement best TCP practices on timeouts and keeping open
 connections.
 
diff --git a/tdns/tres.md b/tdns/tres.md
index 5815344..a70f036 100644
--- a/tdns/tres.md
+++ b/tdns/tres.md
@@ -7,7 +7,7 @@ Note: this page is part of the
 # teaching Resolver
 Welcome to `tres`, a 'from scratch' teaching resolver,
 implementing a basic resolver in 500 lines of code.  Code is
-[here](https://github.com/ahupowerdns/hello-dns/tree/master/tdns).  To
+[here](https://github.com/Habbie/hello-dns/tree/master/tdns).  To
 compile, see the end of this document.
 
 Even though the 'hello-dns' documents describe how basic DNS works,  nothing
@@ -43,7 +43,7 @@ achieve can be found [here](intro.md.html).
 `tres` can be used to browse the web successfully.  All popular domains
 work.  The code is not quite in a teachable state yet and still contains
 some ugly bits.  But well worth [a
-read](https://github.com/ahupowerdns/hello-dns/blob/master/tdns/tres.cc).
+read](https://github.com/Habbie/hello-dns/blob/master/tdns/tres.cc).
 
 # Infrastructure
 `tres` uses the same DNS packet parsing/generating code as the `tdns`
@@ -94,7 +94,7 @@ This requires a recent compiler version that supports C++ 2014. If you
 encounter problems, please let me know (see above for address details).
 
 ```
-$ git clone --recursive https://github.com/ahupowerdns/hello-dns.git
+$ git clone --recursive https://github.com/Habbie/hello-dns.git
 $ cd hello-dns/tdns
 $ make -j4 tres
 $ ./tres www.powerdns.org A