diff --git a/.tours/db-native.tour b/.tours/db-native.tour
index f0b0e9a4..7c63ac2f 100644
--- a/.tours/db-native.tour
+++ b/.tours/db-native.tour
@@ -8,7 +8,7 @@
     },
     {
       "file": "bookshop/db/schema.cds",
-      "description": "#### Basic Schema\n\nWe want to add 2 fields to the `Authors` entity, one for the author's age and one for the span of years that she or he lived.  These 2 fields can be computed out of the existing `dateOfBirth` and `dateOfDeath` fields.",
+      "description": "#### Basic Schema\n\nWe want to add two fields to the `Authors` entity, one for the author's age and one for the span of years that she or he lived.  These two fields can be computed out of the existing `dateOfBirth` and `dateOfDeath` fields.",
       "selection": {
         "start": {
           "line": 19,
@@ -23,7 +23,7 @@
     },
     {
       "file": "bookshop/srv/admin-service.cds",
-      "description": "This is how the `Authors` entity gets exposed in an OData or Rest service.\n\nIn the next step you will see how we extend this projection.",
+      "description": "This is how the `Authors` entity gets exposed in an OData or REST service.\n\nIn the next step you will see how we extend this projection.",
       "selection": {
         "start": {
           "line": 4,
@@ -38,7 +38,7 @@
     },
     {
       "file": "fiori/db/sqlite/index.cds",
-      "description": "#### SQLite implementation\n\nHere is the first implementation for SQLite.  It computes the 2 fields `age` and `lifetime` through SQLite's [strftime](https://sqlite.org/lang_datefunc.html) function.\n\nThrough the [`extend projection`](https://cap.cloud.sap/docs/cds/cdl#extend-view) clause you can add additional fields to projection entities.  These are deployed as database views, which is why we can integrate the database functions in the first place.",
+      "description": "#### SQLite implementation\n\nHere is the first implementation for SQLite.  It computes the two fields `age` and `lifetime` through SQLite's [strftime](https://sqlite.org/lang_datefunc.html) function.\n\nThrough the [`extend projection`](https://cap.cloud.sap/docs/cds/cdl#extend-view) clause you can add additional fields to projection entities.  These are deployed as database views, which is why we can integrate the database functions in the first place.",
       "selection": {
         "start": {
           "line": 7,
@@ -53,7 +53,7 @@
     },
     {
       "file": "fiori/db/hana/index.cds",
-      "description": "#### SAP HANA Implementation\n\nThis is the second implementation for SAP HANA.  It computes the same 2 fields `age` and `lifetime` through the [YEARS_BETWEEN](https://help.sap.com/viewer/7c78579ce9b14a669c1f3295b0d8ca16/Cloud/en-US/7c0d2c161ea34def86de3f5eadd6a0af.html) and [YEAR](https://help.sap.com/viewer/7c78579ce9b14a669c1f3295b0d8ca16/Cloud/en-US/20f5fac6751910148dabd3c6821f907d.html) functions of SAP HANA.\n\n#### File Layout\n\nNote the path of the `.cds` file we are in: it's in a subfolder of `db`, so that it's _not_ automatically picked up when we start the application.  The same is true for the SQLite implementation: it's in a separate `db/sqlite/`\nfolder as well.  In the next step you will see how these files are loaded.",
+      "description": "#### SAP HANA Implementation\n\nThis is the second implementation for SAP HANA.  It computes the same two fields `age` and `lifetime` through the [YEARS_BETWEEN](https://help.sap.com/viewer/7c78579ce9b14a669c1f3295b0d8ca16/Cloud/en-US/7c0d2c161ea34def86de3f5eadd6a0af.html) and [YEAR](https://help.sap.com/viewer/7c78579ce9b14a669c1f3295b0d8ca16/Cloud/en-US/20f5fac6751910148dabd3c6821f907d.html) functions of SAP HANA.\n\n#### File Layout\n\nNote the path of the `.cds` file we are in: it's in a subfolder of `db`, so that it's _not_ automatically picked up when we start the application.  The same is true for the SQLite implementation: it's in a separate `db/sqlite/`\nfolder as well.  In the next step you will see how these files are loaded.",
       "selection": {
         "start": {
           "line": 7,
@@ -74,19 +74,19 @@
     },
     {
       "file": "fiori/package.json",
-      "description": "To run with `development` and an in-memory SQLite database, you don'y need to do anything special, because it's activated by default.  Just run\n\n>> cds watch fiori\n\nThen open http://localhost:4004/admin/Authors to see the 2 new fields.\n",
+      "description": "To run with `development` and an in-memory SQLite database, you don'y need to do anything special, because it's activated by default.  Just run:\n\n>> cds watch fiori\n\nThen open http://localhost:4004/admin/Authors to see the two new fields.\n",
       "line": 28,
       "title": "Run with SQLite"
     },
     {
       "file": "fiori/package.json",
-      "description": "#### Deploy the CDS model to SAP HANA:\n\nTo 'activate' SAP HANA through the `production` profile, you can use the global `--production` flag:\n\n>> cd fiori; cds deploy --to hana --production\n\n[Learn more about SAP HANA deployment](https://cap.cloud.sap/docs/guides/databases#get-hana)\n\n#### Run the application\n\n>> cd fiori; cds watch --production\n\nThe service on http://localhost:4004/admin/Authors is the same as before, but this time the `Authors` entity is backed by a database view with an SAP HANA function.\n\n#### More\nIf you don't see data, you can add some in the next step.",
+      "description": "#### Deploy the CDS Model to SAP HANA:\n\nTo 'activate' SAP HANA through the `production` profile, you can use the global `--production` flag:\n\n>> cd fiori; cds deploy --to hana --production\n\n[Learn more about SAP HANA deployment](https://cap.cloud.sap/docs/guides/databases#get-hana)\n\n#### Run the Application\n\n>> cd fiori; cds watch --production\n\nThe service on http://localhost:4004/admin/Authors is the same as before, but this time the `Authors` entity is backed by a database view with an SAP HANA function.\n\n#### More\nIf you don't see data, you can add some in the next step.",
       "line": 31,
       "title": "Run with SAP HANA"
     },
     {
       "file": "fiori/test/requests.http",
-      "description": "### Add more data\n\nOptionally you may add some data by clicking on the _Send Request_ link (provided by the [Rest client](https://marketplace.visualstudio.com/items?itemName=humao.rest-client) extension).\n\n### Summary\n\nThat's it!  You have seen \n- How to integrate database-specific functions in a CDS model\n- How to switch between the two implementations for SQLite and SAP HANA.",
+      "description": "### Add More Data\n\nOptionally you may add some data by clicking on the _Send Request_ link (provided by the [REST client](https://marketplace.visualstudio.com/items?itemName=humao.rest-client) extension).\n\n### Summary\n\nThat's it!  You have seen: \n- How to integrate database-specific functions in a CDS model.\n- How to switch between the two implementations for SQLite and SAP HANA.",
       "line": 68,
       "selection": {
         "start": {