diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14931f9..77d706f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,15 +10,18 @@ stages:
 - security
 - test
 - release
-- trigger
-- pages
+- metadata
 
+# ====================
+# security stage
+# ====================
 mirror:
   stage: security
   script:
   - npmci git mirror
   tags:
   - docker
+  - notpriv
 
 snyk:
   stage: security
@@ -28,7 +31,11 @@ snyk:
     - npmci command snyk test
   tags:
   - docker
+  - notpriv
 
+# ====================
+# test stage
+# ====================
 testLEGACY:
   stage: test
   script:
@@ -38,6 +45,7 @@ testLEGACY:
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - notpriv
   allow_failure: true
 
 testLTS:
@@ -49,6 +57,7 @@ testLTS:
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - notpriv
     
 testSTABLE:
   stage: test
@@ -59,34 +68,60 @@ testSTABLE:
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - notpriv
 
 release:
   stage: release
   script:
-  - npmci npm prepare
+  - npmci node install stable
   - npmci npm publish
   only:
   - tags
   tags:
   - docker
+  - notpriv
+
+# ====================
+# metadata stage
+# ====================
+codequality:
+  stage: metadata
+  image: docker:stable
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SOURCE_CODE="$PWD"
+        --volume "$PWD":/code
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
+  artifacts:
+    paths: [codeclimate.json]
+  tags:
+  - docker
+  - priv
 
 trigger:
-  stage: trigger
+  stage: metadata
   script:
   - npmci trigger
   only:
   - tags
   tags:
   - docker
+  - notpriv
 
 pages:
   image: hosttoday/ht-docker-node:npmci
-  stage: pages
+  stage: metadata
   script:
     - npmci command yarn global add npmpage
     - npmci command npmpage
   tags:
     - docker
+    - notpriv
   only:
     - tags
   artifacts:
diff --git a/ts/smartuniverse.classes.manager.ts b/ts/smartuniverse.classes.manager.ts
index a7cafdc..9aaf801 100644
--- a/ts/smartuniverse.classes.manager.ts
+++ b/ts/smartuniverse.classes.manager.ts
@@ -16,7 +16,5 @@ export class UniverseManager {
    * @param channelName the name of the channel
    * @param authSecret the secret against which to verify members of the channel
    */
-  public async registerChannel(channelName: string, authSecret: string) {
-    
-  }
+  public async registerChannel(channelName: string, authSecret: string) {}
 }
diff --git a/ts/smartuniverse.classes.universechannel.ts b/ts/smartuniverse.classes.universechannel.ts
index c324936..9fd4be7 100644
--- a/ts/smartuniverse.classes.universechannel.ts
+++ b/ts/smartuniverse.classes.universechannel.ts
@@ -10,6 +10,14 @@ export class UniverseChannel {
    * stores the channels that are available within the universe
    */
   public static channelStore = new Objectmap();
+  
+  /**
+   * the credentials for the channel
+   */
+  private credentials: {
+    user: string;
+    password: string;
+  };
 
   /**
    * creates new channels
@@ -18,11 +26,6 @@ export class UniverseChannel {
    */
   public static createChannel = (channelArg: string, secretArg: string) => {
 
-  }
-
-  credentials: {
-    user: string;
-    password: string;
   };
 
   /**
diff --git a/ts/smartuniverse.classes.universemessage.ts b/ts/smartuniverse.classes.universemessage.ts
index d5ea6b2..4cd0e3e 100644
--- a/ts/smartuniverse.classes.universemessage.ts
+++ b/ts/smartuniverse.classes.universemessage.ts
@@ -14,9 +14,21 @@ export class UniverseMessage {
    * avoids duplications though
    */
   public id: number;
+
+  /**
+   * the universe store the message is attached to
+   */
   public universeStore: UniverseStore;
-  public timestamp: TimeStamp; // when has this message been created
-  public topic: string; // enables unprotected grouping of messages for efficiency purposes.
+
+  /**
+   * time of creation
+   */
+  public timestamp: TimeStamp;
+
+  /**
+   * enables unprotected grouping of messages for efficiency purposes.
+   */
+  public universeChannel: string;
   public message: string; // the actual message
   public attachedPayload: any; // any attached payloads. Can be of binary format.
   public destructionTimer: Timer; // a timer to take care of message destruction
@@ -24,9 +36,9 @@ export class UniverseMessage {
   /**
    * the constructor to create a universe message
    * @param parentUniverseStore
-   * @param messageArg 
-   * @param attachedPayloadArg 
-   * @param selfdestructAfterArg 
+   * @param messageArg
+   * @param attachedPayloadArg
+   * @param selfdestructAfterArg
    */
   constructor(
     parentUniverseStore: UniverseStore,