diff --git a/background/main.ts b/background/main.ts
index 746d81a60..724c4c978 100644
--- a/background/main.ts
+++ b/background/main.ts
@@ -16,6 +16,8 @@
 
 /**
  * Entry point for the background page.
+ * 
+ * @author Florian Dold
  */
 
 "use strict";
@@ -34,4 +36,4 @@ System.import("../lib/wallet/wxMessaging")
       .catch((e) => {
         console.log("wallet failed");
         console.error(e.stack);
-      });
\ No newline at end of file
+      });
diff --git a/content_scripts/notify.ts b/content_scripts/notify.ts
index 6fa965ba7..afc03c934 100644
--- a/content_scripts/notify.ts
+++ b/content_scripts/notify.ts
@@ -14,16 +14,19 @@
  TALER; see the file COPYING.  If not, If not, see <http://www.gnu.org/licenses/>
  */
 
-/// <reference path="../lib/decl/chrome/chrome.d.ts" />
-
-"use strict";
-
 
 /**
  * Script that is injected into (all!) pages to allow them
  * to interact with the GNU Taler wallet via DOM Events.
+ *
+ * @author Florian Dold
  */
 
+
+/// <reference path="../lib/decl/chrome/chrome.d.ts" />
+
+"use strict";
+
 // Make sure we don't pollute the namespace too much.
 namespace TalerNotify {
   const PROTOCOL_VERSION = 1;
diff --git a/gulpfile.js b/gulpfile.js
index fc0134457..a683e7b17 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -25,6 +25,8 @@
  *   development
  * - package: create Chrome extension zip file in
  *   build/.
+ *
+ * @author Florian Dold
  */
 
 const gulp = require("gulp");
diff --git a/lib/module-trampoline.js b/lib/module-trampoline.js
index 22173aa42..1f0247f35 100644
--- a/lib/module-trampoline.js
+++ b/lib/module-trampoline.js
@@ -17,6 +17,8 @@
 
 /**
  * Boilerplate to initialize the module system and call main()
+ *
+ * @author Florian Dold
  */
 
 "use strict";
@@ -75,4 +77,4 @@ System.import(me)
   .catch((e) => {
     console.log("trampoline failed");
     console.error(e.stack);
-  });
\ No newline at end of file
+  });
diff --git a/lib/wallet/cryptoApi.ts b/lib/wallet/cryptoApi.ts
index 300b928db..3cbed89c3 100644
--- a/lib/wallet/cryptoApi.ts
+++ b/lib/wallet/cryptoApi.ts
@@ -15,6 +15,12 @@
  */
 
 
+/**
+ * API to access the Taler crypto worker thread.
+ * @author Florian Dold
+ */
+
+
 import {PreCoin} from "./types";
 import {Reserve} from "./types";
 import {Denomination} from "./types";
@@ -90,4 +96,4 @@ export class CryptoApi {
   rsaUnblind(sig: string, bk: string, pk: string): Promise<string> {
     return this.doRpc("rsaUnblind", sig, bk, pk);
   }
-}
\ No newline at end of file
+}
diff --git a/lib/wallet/cryptoLib.ts b/lib/wallet/cryptoLib.ts
index 5546dcebe..769cb3356 100644
--- a/lib/wallet/cryptoLib.ts
+++ b/lib/wallet/cryptoLib.ts
@@ -14,7 +14,6 @@
  TALER; see the file COPYING.  If not, If not, see <http://www.gnu.org/licenses/>
  */
 
-import {Denomination} from "./types";
 /**
  * Web worker for crypto operations.
  * @author Florian Dold
@@ -28,6 +27,7 @@ import create = chrome.alarms.create;
 import {Offer} from "./wallet";
 import {CoinWithDenom} from "./wallet";
 import {CoinPaySig} from "./types";
+import {Denomination} from "./types";
 
 
 export function main(worker: Worker) {
diff --git a/lib/wallet/helpers.ts b/lib/wallet/helpers.ts
index a7d164102..477fce33f 100644
--- a/lib/wallet/helpers.ts
+++ b/lib/wallet/helpers.ts
@@ -18,6 +18,8 @@
 /**
  * Smaller helper functions that do not depend
  * on the emscripten machinery.
+ *
+ * @author Florian Dold
  */
 
 import {AmountJson} from "./types";
diff --git a/lib/wallet/http.ts b/lib/wallet/http.ts
index 3f7244e40..3bc80f40a 100644
--- a/lib/wallet/http.ts
+++ b/lib/wallet/http.ts
@@ -81,4 +81,4 @@ export class RequestException {
   constructor(detail) {
 
   }
-}
\ No newline at end of file
+}
diff --git a/lib/wallet/types.ts b/lib/wallet/types.ts
index a0e22dbca..748df6f4c 100644
--- a/lib/wallet/types.ts
+++ b/lib/wallet/types.ts
@@ -21,6 +21,8 @@
  * are defined in types.ts are intended to be used by components
  * that do not depend on the whole wallet implementation (which depends on
  * emscripten).
+ *
+ * @author Florian Dold
  */
 
 import {Checkable} from "./checkable";
diff --git a/lib/wallet/wxApi.ts b/lib/wallet/wxApi.ts
index 9871b6e7f..2b69ff82e 100644
--- a/lib/wallet/wxApi.ts
+++ b/lib/wallet/wxApi.ts
@@ -19,6 +19,7 @@ import {ReserveCreationInfo} from "./types";
 
 /**
  * Interface to the wallet through WebExtension messaging.
+ * @author Florian Dold
  */
 
 
@@ -37,4 +38,4 @@ export function getReserveCreationInfo(baseUrl: string,
       resolve(resp);
     });
   });
-}
\ No newline at end of file
+}
diff --git a/pages/confirm-contract.tsx b/pages/confirm-contract.tsx
index ff6ffba64..9ce1b0a5a 100644
--- a/pages/confirm-contract.tsx
+++ b/pages/confirm-contract.tsx
@@ -14,6 +14,13 @@
  TALER; see the file COPYING.  If not, If not, see <http://www.gnu.org/licenses/>
  */
 
+/**
+ * Page shown to the user to confirm entering
+ * a contract.
+ *
+ * @author Florian Dold
+ */
+
 /// <reference path="../lib/decl/handlebars/handlebars.d.ts" />
 "use strict";
 
@@ -79,4 +86,4 @@ export function main() {
                                                         offer);
     });
   }
-}
\ No newline at end of file
+}
diff --git a/pages/confirm-create-reserve.tsx b/pages/confirm-create-reserve.tsx
index 914f58cad..5ed97db04 100644
--- a/pages/confirm-create-reserve.tsx
+++ b/pages/confirm-create-reserve.tsx
@@ -14,6 +14,14 @@
  TALER; see the file COPYING.  If not, If not, see <http://www.gnu.org/licenses/>
  */
 
+
+/**
+ * Page shown to the user to confirm creation
+ * of a reserve, usually requested by the bank.
+ *
+ * @author Florian Dold
+ */
+
 /// <reference path="../lib/decl/mithril.d.ts" />
 
 import {amountToPretty, canonicalizeBaseUrl} from "../lib/wallet/helpers";
diff --git a/pages/show-db.ts b/pages/show-db.ts
index 1c414dde7..c99d2f2b3 100644
--- a/pages/show-db.ts
+++ b/pages/show-db.ts
@@ -15,6 +15,12 @@
  */
 
 
+/**
+ * Wallet database dump for debugging.
+ *
+ * @author Florian Dold
+ */
+
 function replacer(match, pIndent, pKey, pVal, pEnd) {
   var key = '<span class=json-key>';
   var val = '<span class=json-value>';
diff --git a/pogen/pogen.ts b/pogen/pogen.ts
index 77f7ea3dc..5ff182e7c 100644
--- a/pogen/pogen.ts
+++ b/pogen/pogen.ts
@@ -20,6 +20,8 @@
  *
  * Note that duplicate message IDs are NOT merged, to get the same output as
  * you would from xgettext, just run msguniq.
+ *
+ * @author Florian Dold
  */
 
 /// <reference path="../lib/decl/node.d.ts" />
diff --git a/popup/popup.css b/popup/popup.css
index 53c9f97ed..7218b7baf 100644
--- a/popup/popup.css
+++ b/popup/popup.css
@@ -1,3 +1,10 @@
+
+/**
+ * @author Gabor X. Toth
+ * @author Marcello Stanisci
+ * @author Florian Dold
+ */
+
 body {
     min-height: 20em;
     width: 30em;
diff --git a/popup/popup.tsx b/popup/popup.tsx
index 963556c32..2cd753e4f 100644
--- a/popup/popup.tsx
+++ b/popup/popup.tsx
@@ -15,6 +15,14 @@
  */
 
 
+/**
+ * Popup shown to the user when they click
+ * the Taler browser action button.
+ *
+ * @author Florian Dold
+ */
+
+
 /// <reference path="../lib/decl/mithril.d.ts" />
 /// <reference path="../lib/decl/lodash.d.ts" />