diff --git a/components/timepicker/timepicker.component.ts b/components/timepicker/timepicker.component.ts
index edeff16202..33ea49bbc3 100644
--- a/components/timepicker/timepicker.component.ts
+++ b/components/timepicker/timepicker.component.ts
@@ -100,17 +100,17 @@ export class Timepicker implements ControlValueAccessor, OnInit {
   private set showMeridian(value:boolean) {
     this._showMeridian = value;
     // || !this.$error.time
-    if (true) {
-      this.updateTemplate();
-      return;
-    }
+    //if (true) {
+    this.updateTemplate();
+    return;
+    //}
     // Evaluate from template
-    let hours = this.getHoursFromTemplate();
+    /*let hours = this.getHoursFromTemplate();
     let minutes = this.getMinutesFromTemplate();
     if (isDefined(hours) && isDefined(minutes)) {
       this.selected.setHours(hours);
       this.refresh();
-    }
+    }*/
   }
 
   // result value
diff --git a/demo/components/accordion/accordion-demo.ts b/demo/components/accordion/accordion-demo.ts
index 925c533452..1b36ede7fa 100644
--- a/demo/components/accordion/accordion-demo.ts
+++ b/demo/components/accordion/accordion-demo.ts
@@ -1,5 +1,3 @@
-/// <reference path="../../../tsd.d.ts" />
-
 import { Component, View } from 'angular2/core';
 import { CORE_DIRECTIVES, FORM_DIRECTIVES } from 'angular2/common';
 
diff --git a/demo/components/alert-section.ts b/demo/components/alert-section.ts
index 364758cfd0..5997c8551c 100644
--- a/demo/components/alert-section.ts
+++ b/demo/components/alert-section.ts
@@ -1,4 +1,3 @@
-/// <reference path="../../tsd.d.ts" />
 import { Component } from 'angular2/core';
 import { CORE_DIRECTIVES } from 'angular2/common';
 
diff --git a/demo/components/alert/alert-demo.ts b/demo/components/alert/alert-demo.ts
index a405fce9cb..7866072d2b 100644
--- a/demo/components/alert/alert-demo.ts
+++ b/demo/components/alert/alert-demo.ts
@@ -1,5 +1,3 @@
-/// <reference path="../../../tsd.d.ts" />
-
 import { Component } from 'angular2/core';
 import { CORE_DIRECTIVES } from 'angular2/common';
 import { Alert } from '../../../ng2-bootstrap';
diff --git a/demo/components/buttons-section.ts b/demo/components/buttons-section.ts
index 7f5a94c759..1ccc241374 100644
--- a/demo/components/buttons-section.ts
+++ b/demo/components/buttons-section.ts
@@ -1,5 +1,3 @@
-/// <reference path="../../tsd.d.ts" />
-
 import { Component } from 'angular2/core';
 import { CORE_DIRECTIVES } from 'angular2/common';
 
diff --git a/demo/components/carousel-section.ts b/demo/components/carousel-section.ts
index eebe9701a8..0bfc15a106 100644
--- a/demo/components/carousel-section.ts
+++ b/demo/components/carousel-section.ts
@@ -1,5 +1,3 @@
-/// <reference path="../../tsd.d.ts" />
-
 import {Component} from 'angular2/core';
 import {CORE_DIRECTIVES} from 'angular2/common';
 
diff --git a/demo/components/carousel/carousel-demo.ts b/demo/components/carousel/carousel-demo.ts
index 6080494c58..de3089aa7b 100644
--- a/demo/components/carousel/carousel-demo.ts
+++ b/demo/components/carousel/carousel-demo.ts
@@ -1,5 +1,3 @@
-/// <reference path="../../../tsd.d.ts" />
-
 import {Component} from 'angular2/core';
 import {CORE_DIRECTIVES, FORM_DIRECTIVES} from 'angular2/common';
 import {CAROUSEL_DIRECTIVES} from '../../../ng2-bootstrap';
diff --git a/demo/components/collapse-section.ts b/demo/components/collapse-section.ts
index 221f6356c2..9c54c22e94 100644
--- a/demo/components/collapse-section.ts
+++ b/demo/components/collapse-section.ts
@@ -1,5 +1,3 @@
-/// <reference path="../../tsd.d.ts" />
-
 import {Component} from 'angular2/core';
 import {CORE_DIRECTIVES} from 'angular2/common';
 
diff --git a/demo/components/datepicker-section.ts b/demo/components/datepicker-section.ts
index 02c47cb90c..5e20dc785f 100644
--- a/demo/components/datepicker-section.ts
+++ b/demo/components/datepicker-section.ts
@@ -1,5 +1,3 @@
-/// <reference path="../../tsd.d.ts" />
-
 import {Component, View} from 'angular2/core';
 import { CORE_DIRECTIVES } from 'angular2/common';
 
diff --git a/demo/components/datepicker/datepicker-demo.ts b/demo/components/datepicker/datepicker-demo.ts
index b063b989cc..04aa6c0c68 100644
--- a/demo/components/datepicker/datepicker-demo.ts
+++ b/demo/components/datepicker/datepicker-demo.ts
@@ -1,5 +1,3 @@
-/// <reference path="../../../tsd.d.ts" />
-
 import {Component} from 'angular2/core';
 import {CORE_DIRECTIVES, FORM_DIRECTIVES} from 'angular2/common';
 
diff --git a/demo/components/demo-header.ts b/demo/components/demo-header.ts
index 112ec08966..5acb094198 100644
--- a/demo/components/demo-header.ts
+++ b/demo/components/demo-header.ts
@@ -1,4 +1,3 @@
-/// <reference path="../../tsd.d.ts" />
 import {Component} from 'angular2/core';
 import {CORE_DIRECTIVES} from 'angular2/common';
 import {
diff --git a/demo/components/demo-section.ts b/demo/components/demo-section.ts
index 94516bf641..b182a3cc69 100644
--- a/demo/components/demo-section.ts
+++ b/demo/components/demo-section.ts
@@ -1,11 +1,9 @@
-/// <reference path="../../tsd.d.ts" />
-
 import {
   Component, View, OnInit
 } from 'angular2/core';
 import { CORE_DIRECTIVES } from 'angular2/common';
 
-import {tabs} from '../../ng2-bootstrap';
+import {TAB_DIRECTIVES} from '../../ng2-bootstrap';
 
 let name = 'Alerts';
 let src = 'https://github.com/valor-software/ng2-bootstrap/blob/master/components/alert/alert.ts';
@@ -76,7 +74,7 @@ export class DemoSectionConfig {
     </div>
   </section>
   `,
-  directives: [tabs, CORE_DIRECTIVES]
+  directives: [TAB_DIRECTIVES, CORE_DIRECTIVES]
 })
 export class DemoSection {
   private demoSection: DemoSectionConfig;
diff --git a/demo/components/dropdown-section.ts b/demo/components/dropdown-section.ts
index b64f975872..61d30cb242 100644
--- a/demo/components/dropdown-section.ts
+++ b/demo/components/dropdown-section.ts
@@ -1,5 +1,3 @@
-/// <reference path="../../tsd.d.ts" />
-
 import {Component} from 'angular2/core';
 import {CORE_DIRECTIVES} from 'angular2/common';
 
diff --git a/demo/index.ts b/demo/index.ts
index 110cb74fc1..0d78dd3242 100644
--- a/demo/index.ts
+++ b/demo/index.ts
@@ -1,12 +1,15 @@
-/// <reference path="../tsd.d.ts" />
+/// <reference path="../typings/browser.d.ts" />
 import {
-  Component, View,
+  Component, View, enableProdMode,
 } from 'angular2/core';
 import { CORE_DIRECTIVES } from 'angular2/common';
 import { bootstrap } from 'angular2/platform/browser';
 
 import {Ng2BootstrapConfig, Ng2BootstrapTheme} from '../ng2-bootstrap';
 
+// todo: enable prod mod only for prod build
+enableProdMode();
+
 let w:any = window;
 if (w && w.__theme === 'bs4') {
   Ng2BootstrapConfig.theme = Ng2BootstrapTheme.BS4;
diff --git a/make.js b/make.js
index da91747fb7..ec6ed6c661 100755
--- a/make.js
+++ b/make.js
@@ -20,7 +20,7 @@ const targetFolder = 'bundles';
 async.waterfall([
   cleanBundlesFolder,
   getSystemJsBundleConfig,
-  buildSystemJs({}),
+  buildSystemJs({mangle: false}),
   getSystemJsBundleConfig,
   buildSystemJs({minify: true, sourceMaps: true, mangle: false}),
   gzipSystemJsBundle
diff --git a/typings.json b/typings.json
index 5f5aa3ef32..9166dabd56 100644
--- a/typings.json
+++ b/typings.json
@@ -6,6 +6,7 @@
   "devDependencies": {},
   "ambientDependencies": {
     "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c",
+    "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#dd638012d63e069f2c99d06ef4dcc9616a943ee4",
     "require": "github:DefinitelyTyped/DefinitelyTyped/requirejs/require.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c"
   }
 }