diff --git a/components/accordion/accordion-group.component.ts b/components/accordion/accordion-group.component.ts
index b7cd3d6942..e33abc7635 100644
--- a/components/accordion/accordion-group.component.ts
+++ b/components/accordion/accordion-group.component.ts
@@ -1,9 +1,11 @@
-import {Component, OnInit, OnDestroy, Input, HostBinding, Inject} from 'angular2/core';
+import {
+  Component, OnInit, OnDestroy, Input, HostBinding, Inject
+} from 'angular2/core';
 import {NgClass} from 'angular2/common';
-
 import {Collapse} from '../collapse';
 import {Accordion} from './accordion.component';
 
+/* tslint:disable:component-selector-name */
 @Component({
   selector: 'accordion-group, accordion-panel',
   directives: [Collapse, NgClass],
@@ -31,7 +33,8 @@ export class AccordionPanel implements OnInit, OnDestroy {
   @Input() public isDisabled:boolean;
 
   @HostBinding('class.panel-open')
-  @Input() public get isOpen():boolean {
+  @Input()
+  public get isOpen():boolean {
     return this._isOpen;
   }
 
@@ -43,20 +46,22 @@ export class AccordionPanel implements OnInit, OnDestroy {
   }
 
   private _isOpen:boolean;
+  private accordion:Accordion;
 
-  constructor(@Inject(Accordion) private accordion:Accordion) {
+  public constructor(@Inject(Accordion) accordion:Accordion) {
+    this.accordion = accordion;
   }
 
-  ngOnInit() {
+  public ngOnInit():any {
     this.panelClass = this.panelClass || 'panel-default';
     this.accordion.addGroup(this);
   }
 
-  ngOnDestroy() {
+  public ngOnDestroy():any {
     this.accordion.removeGroup(this);
   }
 
-  public toggleOpen(event:MouseEvent) {
+  public toggleOpen(event:MouseEvent):any {
     event.preventDefault();
     if (!this.isDisabled) {
       this.isOpen = !this.isOpen;
diff --git a/components/accordion/accordion.component.ts b/components/accordion/accordion.component.ts
index f954df207b..84b9db4bd5 100644
--- a/components/accordion/accordion.component.ts
+++ b/components/accordion/accordion.component.ts
@@ -1,5 +1,4 @@
 import {Component, Input, HostBinding} from 'angular2/core';
-
 import {AccordionPanel} from './accordion-group.component';
 
 // todo: support template url
@@ -10,15 +9,17 @@ import {AccordionPanel} from './accordion-group.component';
 export class Accordion {
   @Input() public closeOthers:boolean;
 
+  /* tslint:disable:no-unused-variable */
   @HostBinding('class.panel-group')
-  private addClass = true;
+  private addClass:boolean = true;
+  /* tslint:enable:no-unused-variable */
 
-  constructor() {
+  public constructor() {
   }
 
   private groups:Array<AccordionPanel> = [];
 
-  public closeOtherPanels(openGroup:AccordionPanel) {
+  public closeOtherPanels(openGroup:AccordionPanel):void {
     if (!this.closeOthers) {
       return;
     }
@@ -30,11 +31,11 @@ export class Accordion {
     });
   }
 
-  public addGroup(group:AccordionPanel) {
+  public addGroup(group:AccordionPanel):void {
     this.groups.push(group);
   }
 
-  public removeGroup(group:AccordionPanel) {
+  public removeGroup(group:AccordionPanel):void {
     let index = this.groups.indexOf(group);
     if (index !== -1) {
       this.groups.splice(index, 1);
diff --git a/components/alert/alert.component.spec.ts b/components/alert/alert.component.spec.ts
index db77845c32..f70475a526 100644
--- a/components/alert/alert.component.spec.ts
+++ b/components/alert/alert.component.spec.ts
@@ -1,11 +1,4 @@
-import {
-  it,
-  inject,
-  injectAsync,
-  beforeEachProviders,
-  TestComponentBuilder
-} from 'angular2/testing';
-
+import {it, inject, beforeEachProviders} from 'angular2/testing';
 import {Alert} from './alert.component';
 
 describe('Alert', () => {
@@ -14,6 +7,7 @@ describe('Alert', () => {
   ]);
 
   it('should have default type', inject([Alert], (alert:Alert) => {
-    expect(alert.type).toEqual('warning');
+    expect(alert.type)
+      .toEqual('warning');
   }));
 });
diff --git a/components/alert/alert.component.ts b/components/alert/alert.component.ts
index a3579d0fd9..31164e1170 100644
--- a/components/alert/alert.component.ts
+++ b/components/alert/alert.component.ts
@@ -1,5 +1,5 @@
-import { Component, OnInit, Input, Output, EventEmitter } from 'angular2/core';
-import { NgIf, NgClass } from 'angular2/common';
+import {Component, OnInit, Input, Output, EventEmitter} from 'angular2/core';
+import {NgIf, NgClass} from 'angular2/common';
 
 const ALERT_TEMPLATE = `
   <div class="alert" role="alert" [ngClass]="classes" *ngIf="!closed">
@@ -27,9 +27,9 @@ export class Alert implements OnInit {
   private closed:boolean;
   private classes:Array<string> = [];
 
-  constructor() {}
+  public constructor() {}
 
-  ngOnInit() {
+  public ngOnInit():any {
     this.classes[0] = `alert-${this.type}`;
     if (this.dismissible) {
       this.classes[1] = 'alert-dismissible';
@@ -43,7 +43,7 @@ export class Alert implements OnInit {
   }
 
   // todo: mouse event + touch + pointer
-  onClose() {
+  public onClose():void {
     this.closed = true;
     this.close.emit(this);
   }
diff --git a/components/buttons.ts b/components/buttons.ts
index 62cb09a58e..70a8bfb830 100644
--- a/components/buttons.ts
+++ b/components/buttons.ts
@@ -3,4 +3,4 @@ import {ButtonRadio} from './buttons/button-radio.component';
 
 export {ButtonCheckbox} from './buttons/button-checkbox.component';
 export {ButtonRadio} from './buttons/button-radio.component';
-export const BUTTON_DIRECTIVES = [ButtonCheckbox, ButtonRadio];
+export const BUTTON_DIRECTIVES:Array<any> = [ButtonCheckbox, ButtonRadio];
diff --git a/components/buttons/button-checkbox.component.ts b/components/buttons/button-checkbox.component.ts
index 419c3b86eb..3b87ad229e 100644
--- a/components/buttons/button-checkbox.component.ts
+++ b/components/buttons/button-checkbox.component.ts
@@ -1,55 +1,62 @@
-import { Directive, OnInit, Input, HostBinding, HostListener,
-  Self, Renderer, ElementRef } from 'angular2/core';
-import { ControlValueAccessor, NgModel } from 'angular2/common';
+import {
+  Directive, OnInit, Input, HostBinding, HostListener, Self
+} from 'angular2/core';
+import {ControlValueAccessor, NgModel} from 'angular2/common';
 
-@Directive({ selector: '[btnCheckbox][ngModel]' })
+@Directive({selector: '[btnCheckbox][ngModel]'})
 export class ButtonCheckbox implements ControlValueAccessor, OnInit {
-  @Input() private btnCheckboxTrue:any;
-  @Input() private btnCheckboxFalse:any;
+  public cd:NgModel;
+  @Input() public btnCheckboxTrue:any;
 
+  @Input() public btnCheckboxFalse:any;
   @HostBinding('class.active')
-  private state:boolean = false;
+  public state:boolean = false;
+
+  private value:any;
 
   // view -> model
   @HostListener('click')
-  private onClick() {
+  public onClick():void {
     this.toggle(!this.state);
     this.cd.viewToModelUpdate(this.value);
   }
 
-  private value:any;
-
-  constructor(@Self() public cd:NgModel) {
+  public constructor(@Self() cd:NgModel) {
+    this.cd = cd;
     // hack !
     cd.valueAccessor = this;
   }
 
-  public ngOnInit() {
+  public ngOnInit():any {
     this.toggle(this.trueValue === this.value);
   }
 
-  private get trueValue() {
-    return typeof this.btnCheckboxTrue !== 'undefined' ? this.btnCheckboxTrue : true;
+  private get trueValue():boolean {
+    return typeof this.btnCheckboxTrue !== 'undefined'
+      ? this.btnCheckboxTrue
+      : true;
   }
 
-  private get falseValue() {
-    return typeof this.btnCheckboxFalse !== 'undefined' ? this.btnCheckboxFalse : false;
+  private get falseValue():boolean {
+    return typeof this.btnCheckboxFalse !== 'undefined'
+      ? this.btnCheckboxFalse
+      : false;
   }
 
-  private toggle(state:boolean) {
+  public toggle(state:boolean):void {
     this.state = state;
     this.value = this.state ? this.trueValue : this.falseValue;
   }
 
   // ControlValueAccessor
   // model -> view
-  public writeValue(value:any) {
+  public writeValue(value:any):void {
     this.state = this.trueValue === value;
     this.value = value;
   }
 
-  protected onChange = (_:any) => {};
-  protected onTouched = () => {};
+  protected onChange:any = () => {};
+  protected onTouched:any = () => {};
 
   public registerOnChange(fn:(_:any) => {}):void {
     this.onChange = fn;
diff --git a/components/buttons/button-radio.component.ts b/components/buttons/button-radio.component.ts
index 82ac1fdd0b..961b22c83e 100644
--- a/components/buttons/button-radio.component.ts
+++ b/components/buttons/button-radio.component.ts
@@ -1,52 +1,58 @@
-import { Directive,  OnInit, Input, HostBinding, HostListener,
-  Self, ElementRef } from 'angular2/core';
-import { ControlValueAccessor, NgModel } from 'angular2/common';
+import {
+  Directive, OnInit, Input, HostBinding, HostListener, Self, ElementRef
+} from 'angular2/core';
+import {ControlValueAccessor, NgModel} from 'angular2/common';
 
-@Directive({ selector: '[btnRadio][ngModel]' })
+@Directive({selector: '[btnRadio][ngModel]'})
 export class ButtonRadio implements ControlValueAccessor, OnInit {
+  public cd:NgModel;
+  public el:ElementRef;
+
   @Input() private btnRadio:string;
   @Input() private uncheckable:boolean;
 
   @HostBinding('class.active')
-  private get isActive() {
+  public get isActive():boolean {
     return this.btnRadio === this.value;
   }
 
   @HostListener('click')
-  private onClick() {
+  public onClick():void {
     if (this.uncheckable && this.btnRadio === this.value) {
-      return this.cd.viewToModelUpdate(null);
+      return this.cd.viewToModelUpdate(void 0);
     }
 
     this.cd.viewToModelUpdate(this.btnRadio);
   }
 
-  constructor(@Self() public cd:NgModel, public el:ElementRef) {
+  public constructor(@Self() cd:NgModel, el:ElementRef) {
     // hack!
+    this.cd = cd;
+    this.el = el;
     cd.valueAccessor = this;
   }
 
-  public ngOnInit() {
+  public ngOnInit():void {
     this.uncheckable = typeof this.uncheckable !== 'undefined';
   }
 
   // hack view model!
-  protected get value() {
+  protected get value():any {
     return this.cd.viewModel;
   }
 
-  protected set value(value) {
+  protected set value(value:any) {
     this.cd.viewModel = value;
   }
 
   // ControlValueAccessor
   // model -> view
-  public writeValue(value:any) {
+  public writeValue(value:any):void {
     this.value = value;
   }
 
-  public onChange = (_:any) => {};
-  public onTouched = () => {};
+  public onChange:any = () => {};
+  public onTouched:any = () => {};
 
   public registerOnChange(fn:(_:any) => {}):void {
     this.onChange = fn;
diff --git a/components/carousel/carousel.component.ts b/components/carousel/carousel.component.ts
index 55b2f17280..741e6f39a5 100644
--- a/components/carousel/carousel.component.ts
+++ b/components/carousel/carousel.component.ts
@@ -2,7 +2,6 @@
 
 import {Component, OnDestroy, Input} from 'angular2/core';
 import {NgFor} from 'angular2/common';
-
 import {Ng2BootstrapConfig, Ng2BootstrapTheme} from '../ng2-bootstrap-config';
 import {Slide} from './slide.component';
 
@@ -49,7 +48,8 @@ export class Carousel implements OnDestroy {
   @Input() public noPause:boolean;
   @Input() public noTransition:boolean;
 
-  @Input() public get interval():number {
+  @Input()
+  public get interval():number {
     return this._interval;
   }
 
@@ -65,56 +65,40 @@ export class Carousel implements OnDestroy {
   private currentSlide:Slide;
   private _interval:number;
 
-  public ngOnDestroy() {
+  public ngOnDestroy():void {
     this.destroyed = true;
   }
 
-  public select(nextSlide:Slide, direction:Direction = Direction.UNKNOWN) {
+  public select(nextSlide:Slide, direction:Direction = Direction.UNKNOWN):void {
     let nextIndex = nextSlide.index;
     if (direction === Direction.UNKNOWN) {
-      direction = nextIndex > this.getCurrentIndex() ? Direction.NEXT : Direction.PREV;
+      direction = nextIndex > this.getCurrentIndex()
+        ? Direction.NEXT
+        : Direction.PREV;
     }
 
-    // Prevent this user-triggered transition from occurring if there is already one in progress
+    // Prevent this user-triggered transition from occurring if there is
+    // already one in progress
     if (nextSlide && nextSlide !== this.currentSlide) {
       this.goNext(nextSlide, direction);
     }
   }
 
-  private goNext(slide:Slide, direction:Direction) {
-    if (this.destroyed) {
-      return;
-    }
-
-    slide.direction = direction;
-    slide.active = true;
-
-    if (this.currentSlide) {
-      this.currentSlide.direction = direction;
-      this.currentSlide.active = false;
+  public play():void {
+    if (!this.isPlaying) {
+      this.isPlaying = true;
+      this.restartTimer();
     }
-
-    this.currentSlide = slide;
-
-    // every time you change slides, reset the timer
-    this.restartTimer();
   }
 
-  private getSlideByIndex(index:number) {
-    let len = this.slides.length;
-    for (let i = 0; i < len; ++i) {
-      if (this.slides[i].index === index) {
-        return this.slides[i];
-      }
+  public pause():void {
+    if (!this.noPause) {
+      this.isPlaying = false;
+      this.resetTimer();
     }
-    return null;
-  }
-
-  private getCurrentIndex() {
-    return !this.currentSlide ? 0 : this.currentSlide.index;
   }
 
-  private next() {
+  public next():any {
     let newIndex = (this.getCurrentIndex() + 1) % this.slides.length;
 
     if (newIndex === 0 && this.noWrap) {
@@ -125,8 +109,10 @@ export class Carousel implements OnDestroy {
     return this.select(this.getSlideByIndex(newIndex), Direction.NEXT);
   }
 
-  private prev() {
-    let newIndex = this.getCurrentIndex() - 1 < 0 ? this.slides.length - 1 : this.getCurrentIndex() - 1;
+  public prev():any {
+    let newIndex = this.getCurrentIndex() - 1 < 0
+      ? this.slides.length - 1
+      : this.getCurrentIndex() - 1;
 
     if (this.noWrap && newIndex === this.slides.length - 1) {
       this.pause();
@@ -136,43 +122,7 @@ export class Carousel implements OnDestroy {
     return this.select(this.getSlideByIndex(newIndex), Direction.PREV);
   }
 
-  private restartTimer() {
-    this.resetTimer();
-    let interval = +this.interval;
-    if (!isNaN(interval) && interval > 0) {
-      this.currentInterval = setInterval(() => {
-        let nInterval = +this.interval;
-        if (this.isPlaying && !isNaN(this.interval) && nInterval > 0 && this.slides.length) {
-          this.next();
-        } else {
-          this.pause();
-        }
-      }, interval);
-    }
-  }
-
-  private resetTimer() {
-    if (this.currentInterval) {
-      clearInterval(this.currentInterval);
-      this.currentInterval = null;
-    }
-  }
-
-  public play() {
-    if (!this.isPlaying) {
-      this.isPlaying = true;
-      this.restartTimer();
-    }
-  }
-
-  public pause() {
-    if (!this.noPause) {
-      this.isPlaying = false;
-      this.resetTimer();
-    }
-  }
-
-  public addSlide(slide:Slide) {
+  public addSlide(slide:Slide):void {
     slide.index = this.slides.length;
     this.slides.push(slide);
     if (this.slides.length === 1 || slide.active) {
@@ -185,11 +135,11 @@ export class Carousel implements OnDestroy {
     }
   }
 
-  public removeSlide(slide:Slide) {
+  public removeSlide(slide:Slide):void {
     this.slides.splice(slide.index, 1);
 
     if (this.slides.length === 0) {
-      this.currentSlide = null;
+      this.currentSlide = void 0;
       return;
     }
 
@@ -197,5 +147,62 @@ export class Carousel implements OnDestroy {
       this.slides[i].index = i;
     }
   }
+
+  private goNext(slide:Slide, direction:Direction):void {
+    if (this.destroyed) {
+      return;
+    }
+
+    slide.direction = direction;
+    slide.active = true;
+
+    if (this.currentSlide) {
+      this.currentSlide.direction = direction;
+      this.currentSlide.active = false;
+    }
+
+    this.currentSlide = slide;
+
+    // every time you change slides, reset the timer
+    this.restartTimer();
+  }
+
+  private getSlideByIndex(index:number):any {
+    let len = this.slides.length;
+    for (let i = 0; i < len; ++i) {
+      if (this.slides[i].index === index) {
+        return this.slides[i];
+      }
+    }
+    return void 0;
+  }
+
+  private getCurrentIndex():number {
+    return !this.currentSlide ? 0 : this.currentSlide.index;
+  }
+
+  private restartTimer():any {
+    this.resetTimer();
+    let interval = +this.interval;
+    if (!isNaN(interval) && interval > 0) {
+      this.currentInterval = setInterval(
+        () => {
+          let nInterval = +this.interval;
+          if (this.isPlaying && !isNaN(this.interval) && nInterval > 0 && this.slides.length) {
+            this.next();
+          } else {
+            this.pause();
+          }
+        },
+        interval);
+    }
+  }
+
+  private resetTimer():void {
+    if (this.currentInterval) {
+      clearInterval(this.currentInterval);
+      this.currentInterval = void 0;
+    }
+  }
 }
 
diff --git a/components/carousel/slide.component.ts b/components/carousel/slide.component.ts
index 1b36199909..15bb5bc24f 100644
--- a/components/carousel/slide.component.ts
+++ b/components/carousel/slide.component.ts
@@ -1,6 +1,5 @@
-import {Component, OnInit, OnDestroy, Input, HostBinding } from 'angular2/core';
-
-import {Carousel, Direction} from  './carousel.component';
+import {Component, OnInit, OnDestroy, Input, HostBinding} from 'angular2/core';
+import {Carousel, Direction} from './carousel.component';
 
 @Component({
   selector: 'slide',
@@ -19,16 +18,19 @@ export class Slide implements OnInit, OnDestroy {
 
   @HostBinding('class.item')
   @HostBinding('class.carousel-item')
-  private addClass:boolean = true;
+  public addClass:boolean = true;
+
+  private carousel:Carousel;
 
-  constructor(private carousel:Carousel) {
+  public constructor(carousel:Carousel) {
+    this.carousel = carousel;
   }
 
-  public ngOnInit() {
+  public ngOnInit():void {
     this.carousel.addSlide(this);
   }
 
-  public ngOnDestroy() {
+  public ngOnDestroy():void {
     this.carousel.removeSlide(this);
   }
 }
diff --git a/components/collapse/collapse.component.ts b/components/collapse/collapse.component.ts
index fedacc7db7..5a38ce2681 100644
--- a/components/collapse/collapse.component.ts
+++ b/components/collapse/collapse.component.ts
@@ -1,19 +1,19 @@
 import {Directive, OnInit, ElementRef, Input, HostBinding} from 'angular2/core';
+import {AnimationBuilder} from 'angular2/src/animate/animation_builder';
 // fix: replace with // 'angular2/animate';
 // when https://github.com/angular/angular/issues/5984 will be fixed
-import {AnimationBuilder} from 'angular2/src/animate/animation_builder';
 
 // TODO: remove ElementRef
 // TODO: add on change
 @Directive({selector: '[collapse]'})
 export class Collapse implements OnInit {
-  private animation: any;
+  private animation:any;
 
   // style
   // @HostBinding('style.height')
   // private height:string;
   @HostBinding('style.display')
-  private display: string;
+  private display:string;
   // shown
   @HostBinding('class.in')
   @HostBinding('attr.aria-expanded')
@@ -28,8 +28,7 @@ export class Collapse implements OnInit {
   @HostBinding('class.collapsing')
   private isCollapsing:boolean = false;
 
-  @Input('transition-duration')
-  private transitionDuration: number = 500; // Duration in ms
+  @Input() private transitionDuration:number = 500; // Duration in ms
 
   @Input()
   private set collapse(value:boolean) {
@@ -41,15 +40,21 @@ export class Collapse implements OnInit {
     return this.isExpanded;
   }
 
-  constructor(private _ab: AnimationBuilder, private _el: ElementRef) {
+  private _ab:AnimationBuilder;
+  private _el:ElementRef;
+
+  public constructor(_ab:AnimationBuilder, _el:ElementRef) {
+    this._ab = _ab;
+    this._el = _el;
+
   }
 
-  ngOnInit(): void {
+  public ngOnInit():void {
     this.animation = this._ab.css();
     this.animation.setDuration(this.transitionDuration);
   }
 
-  public toggle() {
+  public toggle():void {
     if (this.isExpanded) {
       this.hide();
     } else {
@@ -57,7 +62,7 @@ export class Collapse implements OnInit {
     }
   }
 
-  public hide() {
+  public hide():void {
     this.isCollapse = false;
     this.isCollapsing = true;
 
@@ -65,30 +70,31 @@ export class Collapse implements OnInit {
     this.isCollapsed = true;
 
     setTimeout(() => {
-      // this.height = '0';
-      // this.isCollapse = true;
-      // this.isCollapsing = false;
-      this.animation
-        .setFromStyles({
-          height: this._el.nativeElement.scrollHeight + 'px'
-        })
-        .setToStyles({
-          height: '0',
-          overflow: 'hidden'
-        });
-
-      this.animation.start(this._el.nativeElement).onComplete(() => {
-        if (this._el.nativeElement.offsetHeight === 0) {
-          this.display = 'none';
-        }
-
-        this.isCollapse = true;
-        this.isCollapsing = false;
-      });
-    }, 4);
+        // this.height = '0';
+        // this.isCollapse = true;
+        // this.isCollapsing = false;
+        this.animation
+          .setFromStyles({
+            height: this._el.nativeElement.scrollHeight + 'px'
+          })
+          .setToStyles({
+            height: '0',
+            overflow: 'hidden'
+          });
+
+        this.animation.start(this._el.nativeElement)
+          .onComplete(() => {
+            if (this._el.nativeElement.offsetHeight === 0) {
+              this.display = 'none';
+            }
+
+            this.isCollapse = true;
+            this.isCollapsing = false;
+          });
+      }, 4);
   }
 
-  public show() {
+  public show():void {
     this.isCollapse = false;
     this.isCollapsing = true;
 
@@ -98,22 +104,23 @@ export class Collapse implements OnInit {
     this.display = '';
 
     setTimeout(() => {
-      // this.height = 'auto';
-      // this.isCollapse = true;
-      // this.isCollapsing = false;
-      this.animation
-        .setFromStyles({
-          height: this._el.nativeElement.offsetHeight,
-          overflow: 'hidden'
-        })
-        .setToStyles({
-          height: this._el.nativeElement.scrollHeight + 'px'
-        });
-
-      this.animation.start(this._el.nativeElement).onComplete(() => {
-        this.isCollapse = true;
-        this.isCollapsing = false;
-      });
-    }, 4);
+        // this.height = 'auto';
+        // this.isCollapse = true;
+        // this.isCollapsing = false;
+        this.animation
+          .setFromStyles({
+            height: this._el.nativeElement.offsetHeight,
+            overflow: 'hidden'
+          })
+          .setToStyles({
+            height: this._el.nativeElement.scrollHeight + 'px'
+          });
+
+        this.animation.start(this._el.nativeElement)
+          .onComplete(() => {
+            this.isCollapse = true;
+            this.isCollapsing = false;
+          });
+      }, 4);
   }
 }
diff --git a/components/common.ts b/components/common.ts
index 79a82c628a..8601067b4d 100644
--- a/components/common.ts
+++ b/components/common.ts
@@ -1,7 +1,7 @@
 import {Directive, TemplateRef, ViewContainerRef, Inject} from 'angular2/core';
 
 export interface IAttribute {
-  [key: string]: any;
+  [key:string]:any;
 }
 
 @Directive({
@@ -9,7 +9,9 @@ export interface IAttribute {
   properties: ['ngTransclude']
 })
 export class NgTransclude {
-  private _ngTransclude: TemplateRef;
+  public viewRef:ViewContainerRef;
+
+  private _ngTransclude:TemplateRef;
 
   private set ngTransclude(templateRef:TemplateRef) {
     this._ngTransclude = templateRef;
@@ -18,10 +20,11 @@ export class NgTransclude {
     }
   }
 
-  private get ngTransclude() {
+  private get ngTransclude():TemplateRef {
     return this._ngTransclude;
   }
 
-  constructor(@Inject(ViewContainerRef) public viewRef:ViewContainerRef) {
+  public constructor(@Inject(ViewContainerRef) _viewRef:ViewContainerRef) {
+    this.viewRef = _viewRef;
   }
 }
diff --git a/components/datepicker.ts b/components/datepicker.ts
index 0c07e0e748..6ee8919363 100644
--- a/components/datepicker.ts
+++ b/components/datepicker.ts
@@ -1,16 +1,12 @@
 /*
-todo: general:
-1. Popup
-2. Keyboard support
-3. custom-class attribute support
-4. date-disabled attribute support
-5. template-url attribute support
+ todo: general:
+ 1. Popup
+ 2. Keyboard support
+ 3. custom-class attribute support
+ 4. date-disabled attribute support
+ 5. template-url attribute support
  */
-//import {DatePickerInner} from './datepicker/datepicker-inner';
 import {DatePickerPopup} from './datepicker/datepicker-popup';
-//import {DayPicker} from './datepicker/daypicker';
-//import {MonthPicker} from './datepicker/monthpicker';
-//import {YearPicker} from './datepicker/yearpicker';
 import {DatePicker} from './datepicker/datepicker';
 
 export {DatePickerPopup} from './datepicker/datepicker-popup';
diff --git a/components/datepicker/datepicker-inner.ts b/components/datepicker/datepicker-inner.ts
index 2920a1e1c0..84fd85f554 100644
--- a/components/datepicker/datepicker-inner.ts
+++ b/components/datepicker/datepicker-inner.ts
@@ -2,40 +2,41 @@ import {Component, OnInit, EventEmitter, Input} from 'angular2/core';
 import {
   CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass, NgModel
 } from 'angular2/common';
-
 import {DateFormatter} from './date-formatter';
 
-const FORMAT_DAY:string = 'DD';
-const FORMAT_MONTH:string = 'MMMM';
-const FORMAT_YEAR:string = 'YYYY';
-const FORMAT_DAY_HEADER:string = 'dd';
-const FORMAT_DAY_TITLE:string = 'MMMM YYYY';
-const FORMAT_MONTH_TITLE:string = 'YYYY';
-const DATEPICKER_MODE:string = 'day';
-const MIN_MODE:string = 'day';
-const MAX_MODE:string = 'year';
-const SHOW_WEEKS:boolean = true;
-const ONLY_CURRENT_MONTH:boolean = false;
-const STARTING_DAY:number = 0;
-const YEAR_RANGE:number = 20;
-const MIN_DATE:Date = null;
-const MAX_DATE:Date = null;
-const SHORTCUT_PROPAGATION:boolean = false;
-
-const DAYS_IN_MONTH = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
-
-const KEYS = {
-  13: 'enter',
-  32: 'space',
-  33: 'pageup',
-  34: 'pagedown',
-  35: 'end',
-  36: 'home',
-  37: 'left',
-  38: 'up',
-  39: 'right',
-  40: 'down'
-};
+const FORMAT_DAY = 'DD';
+const FORMAT_MONTH = 'MMMM';
+const FORMAT_YEAR = 'YYYY';
+const FORMAT_DAY_HEADER = 'dd';
+const FORMAT_DAY_TITLE = 'MMMM YYYY';
+const FORMAT_MONTH_TITLE = 'YYYY';
+const DATEPICKER_MODE = 'day';
+const MIN_MODE = 'day';
+const MAX_MODE = 'year';
+const SHOW_WEEKS = true;
+const ONLY_CURRENT_MONTH = false;
+const STARTING_DAY = 0;
+const YEAR_RANGE = 20;
+// const MIN_DATE:Date = void 0;
+// const MAX_DATE:Date = void 0;
+const SHORTCUT_PROPAGATION = false;
+
+// const DAYS_IN_MONTH = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+
+/*
+ const KEYS = {
+ 13: 'enter',
+ 32: 'space',
+ 33: 'pageup',
+ 34: 'pagedown',
+ 35: 'end',
+ 36: 'home',
+ 37: 'left',
+ 38: 'up',
+ 39: 'right',
+ 40: 'down'
+ };
+ */
 
 @Component({
   selector: 'datepicker-inner',
@@ -48,12 +49,28 @@ const KEYS = {
   directives: [FORM_DIRECTIVES, CORE_DIRECTIVES, NgClass, NgModel]
 })
 export class DatePickerInner implements OnInit {
-  @Input()
-  public datepickerMode:string;
-  @Input()
-  public startingDay:number;
-  @Input()
-  public yearRange:number;
+  @Input() public datepickerMode:string;
+  @Input() public startingDay:number;
+  @Input() public yearRange:number;
+
+  @Input() public minDate:Date;
+  @Input() public maxDate:Date;
+  @Input() public minMode:string;
+  @Input() public maxMode:string;
+  @Input() public showWeeks:boolean;
+  @Input() public formatDay:string;
+  @Input() public formatMonth:string;
+  @Input() public formatYear:string;
+  @Input() public formatDayHeader:string;
+  @Input() public formatDayTitle:string;
+  @Input() public formatMonthTitle:string;
+  @Input() public onlyCurrentMonth:boolean;
+  @Input() public shortcutPropagation:boolean;
+  @Input() public customClass:Array<{date:Date, mode:string, clazz:string}>;
+  // todo: change type during implementation
+  @Input() public dateDisabled:any;
+  @Input() public initDate:Date;
+
   public stepDay:any = {};
   public stepMonth:any = {};
   public stepYear:any = {};
@@ -63,41 +80,7 @@ export class DatePickerInner implements OnInit {
   private uniqueId:string;
   private _activeDate:Date;
   private selectedDate:Date;
-  private _initDate:Date;
   private activeDateId:string;
-  @Input()
-  private minDate:Date;
-  @Input()
-  private maxDate:Date;
-  @Input()
-  private minMode:string;
-  @Input()
-  private maxMode:string;
-  @Input()
-  private showWeeks:boolean;
-  @Input()
-  private formatDay:string;
-  @Input()
-  private formatMonth:string;
-  @Input()
-  private formatYear:string;
-  @Input()
-  private formatDayHeader:string;
-  @Input()
-  private formatDayTitle:string;
-  @Input()
-  private formatMonthTitle:string;
-  @Input()
-  private onlyCurrentMonth:boolean;
-  @Input()
-  private shortcutPropagation:boolean;
-  @Input()
-  private customClass:Array<{date:Date, mode:string, clazz:string}>;
-  // todo: change type during implementation
-  @Input()
-  private dateDisabled:any;
-  @Input()
-  private templateUrl:string;
 
   private refreshViewHandlerDay:Function;
   private compareHandlerDay:Function;
@@ -108,34 +91,29 @@ export class DatePickerInner implements OnInit {
   private update:EventEmitter<Date> = new EventEmitter(false);
 
   @Input()
-  private get initDate():Date {
-    return this._initDate;
-  }
-
-  private set initDate(value:Date) {
-    this._initDate = value;
-  }
-
-  @Input()
-  private get activeDate():Date {
+  public get activeDate():Date {
     return this._activeDate;
   }
 
-  private set activeDate(value:Date) {
+  public set activeDate(value:Date) {
     this._activeDate = value;
     this.refreshView();
   }
 
   // todo: add formatter value to Date object
-  ngOnInit() {
+  public ngOnInit():void {
     this.formatDay = this.formatDay || FORMAT_DAY;
     this.formatMonth = this.formatMonth || FORMAT_MONTH;
     this.formatYear = this.formatYear || FORMAT_YEAR;
     this.formatDayHeader = this.formatDayHeader || FORMAT_DAY_HEADER;
     this.formatDayTitle = this.formatDayTitle || FORMAT_DAY_TITLE;
     this.formatMonthTitle = this.formatMonthTitle || FORMAT_MONTH_TITLE;
-    this.showWeeks = (this.showWeeks === undefined ? SHOW_WEEKS : this.showWeeks);
-    this.onlyCurrentMonth = (this.onlyCurrentMonth === undefined ? ONLY_CURRENT_MONTH : this.onlyCurrentMonth);
+    this.showWeeks = (this.showWeeks === undefined
+      ? SHOW_WEEKS
+      : this.showWeeks);
+    this.onlyCurrentMonth = (this.onlyCurrentMonth === undefined
+      ? ONLY_CURRENT_MONTH
+      : this.onlyCurrentMonth);
     this.startingDay = this.startingDay || STARTING_DAY;
     this.yearRange = this.yearRange || YEAR_RANGE;
     this.shortcutPropagation = this.shortcutPropagation || SHORTCUT_PROPAGATION;
@@ -157,7 +135,7 @@ export class DatePickerInner implements OnInit {
     this.refreshView();
   }
 
-  public setCompareHandler(handler:Function, type:string) {
+  public setCompareHandler(handler:Function, type:string):void {
     if (type === 'day') {
       this.compareHandlerDay = handler;
     }
@@ -184,10 +162,10 @@ export class DatePickerInner implements OnInit {
       return this.compareHandlerYear(date1, date2);
     }
 
-    return null;
+    return void 0;
   }
 
-  public setRefreshViewHandler(handler:Function, type:string) {
+  public setRefreshViewHandler(handler:Function, type:string):void {
     if (type === 'day') {
       this.refreshViewHandlerDay = handler;
     }
@@ -201,7 +179,7 @@ export class DatePickerInner implements OnInit {
     }
   }
 
-  public refreshView() {
+  public refreshView():void {
     if (this.datepickerMode === 'day' && this.refreshViewHandlerDay) {
       this.refreshViewHandlerDay();
     }
@@ -219,7 +197,7 @@ export class DatePickerInner implements OnInit {
     return this.dateFormatter.format(date, format);
   }
 
-  private isActive(dateObject:any):boolean {
+  public isActive(dateObject:any):boolean {
     if (this.compare(dateObject.date, this.activeDate) === 0) {
       this.activeDateId = dateObject.uid;
       return true;
@@ -228,7 +206,7 @@ export class DatePickerInner implements OnInit {
     return false;
   }
 
-  private createDateObject(date:Date, format:string):any {
+  public createDateObject(date:Date, format:string):any {
     let dateObject:any = {};
     dateObject.date = date;
     dateObject.date.setHours(0, 0, 0, 0);
@@ -240,23 +218,7 @@ export class DatePickerInner implements OnInit {
     return dateObject;
   }
 
-  private getCustomClassForDate(date:Date) {
-    if (!this.customClass) {
-      return '';
-    }
-    var customClassObject:{date:Date, mode:string, clazz:string} = this.customClass.find(customClass => {
-      return customClass.date.valueOf() === date.valueOf() && customClass.mode === this.datepickerMode;
-    }, this);
-    return customClassObject === undefined ? '' : customClassObject.clazz;
-  };
-
-  private isDisabled(date:Date):boolean {
-    // todo: implement dateDisabled attribute
-    return ((this.minDate && this.compare(date, this.minDate) < 0) ||
-    (this.maxDate && this.compare(date, this.maxDate) > 0));
-  };
-
-  private split(arr:Array<any>, size:number) {
+  public split(arr:Array<any>, size:number):Array<any> {
     let arrays:Array<any> = [];
     while (arr.length > 0) {
       arrays.push(arr.splice(0, size));
@@ -268,14 +230,14 @@ export class DatePickerInner implements OnInit {
   // The bug depends on OS, browser, current timezone and current date
   // i.e.
   // var date = new Date(2014, 0, 1);
-  // console.log(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours());
-  // can result in "2013 11 31 23" because of the bug.
-  public fixTimeZone(date:Date) {
+  // console.log(date.getFullYear(), date.getMonth(), date.getDate(),
+  // date.getHours()); can result in "2013 11 31 23" because of the bug.
+  public fixTimeZone(date:Date):void {
     let hours = date.getHours();
     date.setHours(hours === 23 ? hours + 2 : 0);
   }
 
-  public select(date:Date) {
+  public select(date:Date):void {
     if (this.datepickerMode === this.minMode) {
       if (!this.activeDate) {
         this.activeDate = new Date(0, 0, 0, 0, 0, 0, 0);
@@ -292,7 +254,7 @@ export class DatePickerInner implements OnInit {
     this.refreshView();
   }
 
-  public move(direction:number) {
+  public move(direction:number):void {
     let expectedStep:any;
     if (this.datepickerMode === 'day') {
       expectedStep = this.stepDay;
@@ -315,7 +277,7 @@ export class DatePickerInner implements OnInit {
     }
   }
 
-  public toggleMode(direction:number) {
+  public toggleMode(direction:number):void {
     direction = direction || 1;
 
     if ((this.datepickerMode === this.maxMode && direction === 1) ||
@@ -327,5 +289,22 @@ export class DatePickerInner implements OnInit {
     this.refreshView();
   }
 
-  // todo: implement key events later
+  private getCustomClassForDate(date:Date):string {
+    if (!this.customClass) {
+      return '';
+    }
+    // todo: build a hash of custom classes, it will work faster
+    const customClassObject:{date:Date, mode:string, clazz:string} = this.customClass
+      .find((customClass:any) => {
+        return customClass.date.valueOf() === date.valueOf() &&
+          customClass.mode === this.datepickerMode;
+      }, this);
+    return customClassObject === undefined ? '' : customClassObject.clazz;
+  }
+
+  private isDisabled(date:Date):boolean {
+    // todo: implement dateDisabled attribute
+    return ((this.minDate && this.compare(date, this.minDate) < 0) ||
+    (this.maxDate && this.compare(date, this.maxDate) > 0));
+  }
 }
diff --git a/components/datepicker/datepicker-popup.ts b/components/datepicker/datepicker-popup.ts
index 30f5e04a22..18d15bfce8 100644
--- a/components/datepicker/datepicker-popup.ts
+++ b/components/datepicker/datepicker-popup.ts
@@ -1,30 +1,25 @@
 import {
-  Component, Directive,
-  OnInit, EventEmitter,
-  ComponentRef, ViewEncapsulation,
-  ElementRef, DynamicComponentLoader,
-  Self, Renderer, bind, Injector
+  Component, Directive, OnInit, EventEmitter, ComponentRef, ViewEncapsulation,
+  ElementRef, DynamicComponentLoader, Self, Renderer, bind, Injector
 } from 'angular2/core';
-
 import {
   CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass, NgModel, NgStyle
 } from 'angular2/common';
-
 import {IAttribute} from '../common';
 import {positionService} from '../position';
-
-//import {DatePickerInner} from './datepicker-inner';
-//import {DayPicker} from './daypicker';
-//import {MonthPicker} from './monthpicker';
-//import {YearPicker} from './yearpicker';
 import {DatePicker} from './datepicker';
 
+// import {DatePickerInner} from './datepicker-inner';
+// import {DayPicker} from './daypicker';
+// import {MonthPicker} from './monthpicker';
+// import {YearPicker} from './yearpicker';
+
 class PopupOptions {
   public placement:string;
   public animation:boolean;
   public isOpen:boolean;
 
-  constructor(options:Object) {
+  public constructor(options:Object) {
     Object.assign(this, options);
   }
 }
@@ -70,19 +65,26 @@ class PopupContainer {
   private left:string;
   private display:string;
   private placement:string;
+
+  // false positive
+  /* tslint:disable:no-unused-variable */
   private showButtonBar:boolean = true;
   private update1:EventEmitter<any> = new EventEmitter(false);
+  /* tslint:enable:no-unused-variable */
+
+  private element:ElementRef;
 
-  constructor(public element:ElementRef, options:PopupOptions) {
+  public constructor(element:ElementRef, options:PopupOptions) {
+    this.element = element;
     Object.assign(this, options);
     this.classMap = {'in': false};
     this.classMap[options.placement] = true;
   }
 
-  public onUpdate($event:any) {
+  public onUpdate($event:any):void {
     console.log('update', $event);
     if ($event) {
-      if (typeof $event !== 'Date') {
+      if ($event.toString() !== '[object Date]') {
         $event = new Date($event);
       }
 
@@ -91,7 +93,7 @@ class PopupContainer {
     }
   }
 
-  public position(hostEl:ElementRef) {
+  public position(hostEl:ElementRef):void {
     this.display = 'block';
     this.top = '0px';
     this.left = '0px';
@@ -102,11 +104,11 @@ class PopupContainer {
     this.top = p.top + 'px';
   }
 
-  private getText(key:string):string {
+  public getText(key:string):string {
     return (<IAttribute>this)[key + 'Text'] || datePickerPopupConfig[key + 'Text'];
   }
 
-  private isDisabled(date:Date):boolean {
+  public isDisabled(/*date:Date*/):boolean {
     return false;
   }
 }
@@ -114,17 +116,26 @@ class PopupContainer {
 @Directive({
   selector: '[datepickerPopup][ngModel]',
   // prop -> datepickerPopup - format
-  properties: ['datepickerPopup', 'isOpen'],
-  host: {'(cupdate)': 'onUpdate1($event)'}
+  properties: ['datepickerPopup', 'isOpen']/*,
+   host: {'(cupdate)': 'onUpdate1($event)'}*/
 })
 export class DatePickerPopup implements OnInit {
+  public cd:NgModel;
+  public element:ElementRef;
+  public renderer:Renderer;
+  public loader:DynamicComponentLoader;
+
   private _activeDate:Date;
-  private placement:string = 'bottom';
   private _isOpen:boolean = false;
+  private placement:string = 'bottom';
   private popup:Promise<ComponentRef>;
 
-  constructor(@Self()
-              public cd:NgModel, public element:ElementRef, public renderer:Renderer, public loader:DynamicComponentLoader) {
+  public constructor(@Self() cd:NgModel, element:ElementRef,
+                     renderer:Renderer, loader:DynamicComponentLoader) {
+    this.cd = cd;
+    this.element = element;
+    this.renderer = renderer;
+    this.loader = loader;
     this.activeDate = cd.model;
   }
 
@@ -154,16 +165,29 @@ export class DatePickerPopup implements OnInit {
     }
   }
 
-  ngOnInit() {
+  public ngOnInit():void {
   }
 
-  private show(cb:Function) {
+  public hide(cb:Function):void {
+    if (this.popup) {
+      this.popup.then((componentRef:ComponentRef) => {
+        componentRef.dispose();
+        cb();
+        return componentRef;
+      });
+    } else {
+      cb();
+    }
+  }
+
+  private show(cb:Function):void {
     let options = new PopupOptions({
       placement: this.placement
     });
 
     let binding = Injector.resolve([
-      bind(PopupOptions).toValue(options)
+      bind(PopupOptions)
+        .toValue(options)
     ]);
 
     this.popup = this.loader
@@ -181,16 +205,4 @@ export class DatePickerPopup implements OnInit {
         return componentRef;
       });
   }
-
-  public hide(cb:Function) {
-    if (this.popup) {
-      this.popup.then((componentRef:ComponentRef) => {
-        componentRef.dispose();
-        cb();
-        return componentRef;
-      });
-    } else {
-      cb();
-    }
-  }
 }
diff --git a/components/datepicker/datepicker.ts b/components/datepicker/datepicker.ts
index 524370c655..3579db013a 100644
--- a/components/datepicker/datepicker.ts
+++ b/components/datepicker/datepicker.ts
@@ -1,19 +1,16 @@
 import {Component, Self, Input} from 'angular2/core';
 import {
-  CORE_DIRECTIVES,
-  FORM_DIRECTIVES,
-  ControlValueAccessor,
-  NgModel
+  CORE_DIRECTIVES, FORM_DIRECTIVES, ControlValueAccessor, NgModel
 } from 'angular2/common';
-
 import {DatePickerInner} from './datepicker-inner';
-//import {DatePickerPopup} from './datepicker-popup';
 import {DayPicker} from './daypicker';
 import {MonthPicker} from './monthpicker';
 import {YearPicker} from './yearpicker';
+// import {DatePickerPopup} from './datepicker-popup';
 
+/* tslint:disable:component-selector-name component-selector-type */
 @Component({
-  selector: 'datepicker[ngModel], [datepicker][ngModel]',
+  selector: 'datepicker[ngModel]',
   template: `
     <datepicker-inner [activeDate]="activeDate"
                       (update)="onUpdate($event)"
@@ -42,11 +39,11 @@ import {YearPicker} from './yearpicker';
       <yearpicker tabindex="0"></yearpicker>
     </datepicker-inner>
     `,
-  directives: [DatePickerInner, DayPicker, MonthPicker, YearPicker, FORM_DIRECTIVES, CORE_DIRECTIVES]
+  directives: [DatePickerInner, DayPicker, MonthPicker, YearPicker,
+    FORM_DIRECTIVES, CORE_DIRECTIVES]
 })
-
+/* tslint:enable:component-selector-name component-selector-type */
 export class DatePicker implements ControlValueAccessor {
-  private _activeDate:Date;
   @Input() public datepickerMode:string;
   @Input() public initDate:Date;
   @Input() public minDate:Date;
@@ -65,13 +62,19 @@ export class DatePicker implements ControlValueAccessor {
   @Input() public onlyCurrentMonth:boolean;
   @Input() public shortcutPropagation:boolean;
   @Input() public customClass:Array<{date:Date, mode:string, clazz:string}>;
-  @Input() public get activeDate():Date {
+// todo: change type during implementation
+  @Input() public dateDisabled:any;
+
+  public cd:NgModel;
+  private _activeDate:Date;
+
+  @Input()
+  public get activeDate():Date {
     return this._activeDate || this._now;
   }
-  // todo: change type during implementation
-  @Input() public dateDisabled:any;
 
-  constructor(@Self() public cd:NgModel) {
+  public constructor(@Self() cd:NgModel) {
+    this.cd = cd;
     // hack
     cd.valueAccessor = this;
   }
@@ -82,13 +85,13 @@ export class DatePicker implements ControlValueAccessor {
     this._activeDate = value;
   }
 
-  private onUpdate(event:any) {
+  public onUpdate(event:any):void {
     this.writeValue(event);
     this.cd.viewToModelUpdate(event);
   }
 
   // todo: support null value
-  writeValue(value:any) {
+  public writeValue(value:any):void {
     // todo: fix something sends here new date all the time
     // if (value) {
     //  if (typeof value !== 'Date') {
@@ -105,19 +108,13 @@ export class DatePicker implements ControlValueAccessor {
       return;
     }
 
-    this.activeDate = value ? new Date(value) : null;
+    this.activeDate = value ? new Date(value) : void 0;
   }
 
-  onChange = (_:any) => {
-  };
-  onTouched = () => {
-  };
+  public onChange:any = () => {};
+  public onTouched:any = () => {};
 
-  registerOnChange(fn:(_:any) => {}):void {
-    this.onChange = fn;
-  }
+  public registerOnChange(fn:(_:any) => {}):void { this.onChange = fn; }
 
-  registerOnTouched(fn:() => {}):void {
-    this.onTouched = fn;
-  }
+  public registerOnTouched(fn:() => {}):void { this.onTouched = fn; }
 }
diff --git a/components/datepicker/daypicker.ts b/components/datepicker/daypicker.ts
index 6651a402b7..15f6eeabf5 100644
--- a/components/datepicker/daypicker.ts
+++ b/components/datepicker/daypicker.ts
@@ -1,10 +1,9 @@
 import {Component, OnInit} from 'angular2/core';
 import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from 'angular2/common';
-
 import {Ng2BootstrapConfig, Ng2BootstrapTheme} from '../ng2-bootstrap-config';
 import {DatePickerInner} from './datepicker-inner';
 
-//write an interface for template options
+// write an interface for template options
 const TEMPLATE_OPTIONS:any = {
   [Ng2BootstrapTheme.BS4]: {
     DAY_TITLE: `
@@ -53,7 +52,7 @@ const TEMPLATE_OPTIONS:any = {
 const CURRENT_THEME_TEMPLATE:any = TEMPLATE_OPTIONS[Ng2BootstrapConfig.theme || Ng2BootstrapTheme.BS3];
 
 @Component({
-  selector: 'daypicker, [daypicker]',
+  selector: 'daypicker',
   template: `
 <table *ngIf="datePicker.datepickerMode==='day'" role="grid" aria-labelledby="uniqueId+'-title'" aria-activedescendant="activeDateId">
   <thead>
@@ -100,51 +99,29 @@ export class DayPicker implements OnInit {
   public title:string;
   public rows:Array<any> = [];
   public weekNumbers:Array<number> = [];
+  public datePicker:DatePickerInner;
 
-  constructor(public datePicker:DatePickerInner) {
+  public constructor(datePicker:DatePickerInner) {
+    this.datePicker = datePicker;
   }
 
   /*private getDaysInMonth(year:number, month:number) {
    return ((month === 1) && (year % 4 === 0) &&
    ((year % 100 !== 0) || (year % 400 === 0))) ? 29 : DAYS_IN_MONTH[month];
    }*/
-
-  private getDates(startDate:Date, n:number) {
-    let dates:Array<Date> = new Array(n);
-    let current = new Date(startDate.getTime());
-    let i = 0;
-    let date:Date;
-    while (i < n) {
-      date = new Date(current.getTime());
-      this.datePicker.fixTimeZone(date);
-      dates[i++] = date;
-      current.setDate(current.getDate() + 1);
-    }
-    return dates;
-  }
-
-  private getISO8601WeekNumber(date:Date):number {
-    let checkDate = new Date(date.getTime());
-    // Thursday
-    checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
-    let time = checkDate.getTime();
-    // Compare with Jan 1
-    checkDate.setMonth(0);
-    checkDate.setDate(1);
-    return Math.floor(Math.round((time - checkDate.getTime()) / 86400000) / 7) + 1;
-  }
-
-  ngOnInit() {
+  public ngOnInit():void {
     let self = this;
 
     this.datePicker.stepDay = {months: 1};
 
-    this.datePicker.setRefreshViewHandler(function () {
+    this.datePicker.setRefreshViewHandler(function ():void {
       let year = this.activeDate.getFullYear();
       let month = this.activeDate.getMonth();
       let firstDayOfMonth = new Date(year, month, 1);
       let difference = this.startingDay - firstDayOfMonth.getDay();
-      let numDisplayedFromPreviousMonth = (difference > 0) ? 7 - difference : -difference;
+      let numDisplayedFromPreviousMonth = (difference > 0)
+        ? 7 - difference
+        : -difference;
       let firstDate = new Date(firstDayOfMonth.getTime());
 
       if (numDisplayedFromPreviousMonth > 0) {
@@ -181,7 +158,7 @@ export class DayPicker implements OnInit {
       }
     }, 'day');
 
-    this.datePicker.setCompareHandler(function (date1:Date, date2:Date) {
+    this.datePicker.setCompareHandler(function (date1:Date, date2:Date):number {
       let d1 = new Date(date1.getFullYear(), date1.getMonth(), date1.getDate());
       let d2 = new Date(date2.getFullYear(), date2.getMonth(), date2.getDate());
       return d1.getTime() - d2.getTime();
@@ -190,5 +167,29 @@ export class DayPicker implements OnInit {
     this.datePicker.refreshView();
   }
 
+  private getDates(startDate:Date, n:number):Array<Date> {
+    let dates:Array<Date> = new Array(n);
+    let current = new Date(startDate.getTime());
+    let i = 0;
+    let date:Date;
+    while (i < n) {
+      date = new Date(current.getTime());
+      this.datePicker.fixTimeZone(date);
+      dates[i++] = date;
+      current.setDate(current.getDate() + 1);
+    }
+    return dates;
+  }
+
+  private getISO8601WeekNumber(date:Date):number {
+    let checkDate = new Date(date.getTime());
+    // Thursday
+    checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
+    let time = checkDate.getTime();
+    // Compare with Jan 1
+    checkDate.setMonth(0);
+    checkDate.setDate(1);
+    return Math.floor(Math.round((time - checkDate.getTime()) / 86400000) / 7) + 1;
+  }
   // todo: key events implementation
 }
diff --git a/components/datepicker/monthpicker.ts b/components/datepicker/monthpicker.ts
index a20ce3b95e..c707181a78 100644
--- a/components/datepicker/monthpicker.ts
+++ b/components/datepicker/monthpicker.ts
@@ -1,18 +1,9 @@
-import {
-  Component, Host,
-  OnInit, EventEmitter,
-  ElementRef, ViewContainerRef,
-  Self, Renderer
-} from 'angular2/core';
-import {CORE_DIRECTIVES, FORM_DIRECTIVES,
-   DefaultValueAccessor, NgIf, NgClass, NgModel
-} from 'angular2/common';
-
-
+import {Component, OnInit} from 'angular2/core';
+import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from 'angular2/common';
 import {DatePickerInner} from './datepicker-inner';
 import {Ng2BootstrapConfig} from '../ng2-bootstrap-config';
 
-//write an interface for template options
+// write an interface for template options
 const TEMPLATE_OPTIONS:any = {
   bs4: {
     MONTH_BUTTON: `
@@ -35,8 +26,8 @@ const TEMPLATE_OPTIONS:any = {
 const CURRENT_THEME_TEMPLATE:any = TEMPLATE_OPTIONS[Ng2BootstrapConfig.theme] || TEMPLATE_OPTIONS.bs3;
 
 @Component({
-  selector: 'monthpicker, [monthpicker]',
-    template: `
+  selector: 'monthpicker',
+  template: `
 <table *ngIf="datePicker.datepickerMode==='month'" role="grid">
   <thead>
     <tr>
@@ -76,16 +67,18 @@ const CURRENT_THEME_TEMPLATE:any = TEMPLATE_OPTIONS[Ng2BootstrapConfig.theme] ||
 export class MonthPicker implements OnInit {
   public title:string;
   public rows:Array<any> = [];
+  public datePicker:DatePickerInner;
 
-  constructor(public datePicker:DatePickerInner) {
+  public constructor(datePicker:DatePickerInner) {
+    this.datePicker = datePicker;
   }
 
-  ngOnInit() {
+  public ngOnInit():void {
     let self = this;
 
     this.datePicker.stepMonth = {years: 1};
 
-    this.datePicker.setRefreshViewHandler(function () {
+    this.datePicker.setRefreshViewHandler(function ():void {
       let months:Array<any> = new Array(12);
       let year:number = this.activeDate.getFullYear();
       let date:Date;
@@ -101,7 +94,7 @@ export class MonthPicker implements OnInit {
       self.rows = this.split(months, 3);
     }, 'month');
 
-    this.datePicker.setCompareHandler(function (date1:Date, date2:Date) {
+    this.datePicker.setCompareHandler(function (date1:Date, date2:Date):number {
       let d1 = new Date(date1.getFullYear(), date1.getMonth());
       let d2 = new Date(date2.getFullYear(), date2.getMonth());
       return d1.getTime() - d2.getTime();
diff --git a/components/datepicker/yearpicker.ts b/components/datepicker/yearpicker.ts
index 5403fd4bc0..4a3f32a9fe 100644
--- a/components/datepicker/yearpicker.ts
+++ b/components/datepicker/yearpicker.ts
@@ -1,17 +1,9 @@
-import {
-  Component, Host,
-  OnInit, EventEmitter,
-  ElementRef, ViewContainerRef,
-  Self, Renderer
-} from 'angular2/core';
-import {CORE_DIRECTIVES, FORM_DIRECTIVES,
-   DefaultValueAccessor, NgIf, NgClass, NgModel
-} from 'angular2/common';
-
+import {Component, OnInit} from 'angular2/core';
+import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from 'angular2/common';
 import {Ng2BootstrapConfig} from '../ng2-bootstrap-config';
 import {DatePickerInner} from './datepicker-inner';
 
-//write an interface for template options
+// write an interface for template options
 const TEMPLATE_OPTIONS:any = {
   bs4: {
     YEAR_BUTTON: `
@@ -38,8 +30,8 @@ const TEMPLATE_OPTIONS:any = {
 const CURRENT_THEME_TEMPLATE:any = TEMPLATE_OPTIONS[Ng2BootstrapConfig.theme] || TEMPLATE_OPTIONS.bs3;
 
 @Component({
-  selector: 'yearpicker, [yearpicker]',
-    template: `
+  selector: 'yearpicker',
+  template: `
 <table *ngIf="datePicker.datepickerMode==='year'" role="grid">
   <thead>
     <tr>
@@ -78,23 +70,20 @@ const CURRENT_THEME_TEMPLATE:any = TEMPLATE_OPTIONS[Ng2BootstrapConfig.theme] ||
   directives: [FORM_DIRECTIVES, CORE_DIRECTIVES, NgClass]
 })
 export class YearPicker implements OnInit {
+  public datePicker:DatePickerInner;
   private title:string;
   private rows:Array<any> = [];
 
-  constructor(public datePicker:DatePickerInner) {
-  }
-
-  private getStartingYear(year:number) {
-    // todo: parseInt
-    return ((year - 1) / this.datePicker.yearRange) * this.datePicker.yearRange + 1;
+  public constructor(datePicker:DatePickerInner) {
+    this.datePicker = datePicker;
   }
 
-  ngOnInit() {
+  public ngOnInit():void {
     let self = this;
 
     this.datePicker.stepYear = {years: this.datePicker.yearRange};
 
-    this.datePicker.setRefreshViewHandler(function () {
+    this.datePicker.setRefreshViewHandler(function ():void {
       let years:Array<any> = new Array(this.yearRange);
       let date:Date;
 
@@ -105,16 +94,20 @@ export class YearPicker implements OnInit {
         years[i].uid = this.uniqueId + '-' + i;
       }
 
-      self.title = [years[0].label, years[this.yearRange - 1].label].join(' - ');
+      self.title = [years[0].label,
+        years[this.yearRange - 1].label].join(' - ');
       self.rows = this.split(years, 5);
     }, 'year');
 
-    this.datePicker.setCompareHandler(function (date1:Date, date2:Date) {
+    this.datePicker.setCompareHandler(function (date1:Date, date2:Date):number {
       return date1.getFullYear() - date2.getFullYear();
     }, 'year');
 
     this.datePicker.refreshView();
   }
 
-  // todo: key events implementation
+  private getStartingYear(year:number):number {
+    // todo: parseInt
+    return ((year - 1) / this.datePicker.yearRange) * this.datePicker.yearRange + 1;
+  }
 }
diff --git a/components/dropdown/dropdown-keyboard-nav.ts b/components/dropdown/dropdown-keyboard-nav.ts
index bf41f27371..18bdb5413a 100644
--- a/components/dropdown/dropdown-keyboard-nav.ts
+++ b/components/dropdown/dropdown-keyboard-nav.ts
@@ -1,19 +1,22 @@
-import {Directive, ElementRef} from 'angular2/core';
+import {Directive, ElementRef, HostListener} from 'angular2/core';
 import {Dropdown} from './dropdown.directive';
 
 @Directive({
-  selector: '[dropdown][dropdownKeyboardNav]',
-  host: {
-    '(keydown)': 'onKeydown($event)'
-  }
+  selector: '[dropdown][dropdownKeyboardNav]'
 })
 export class KeyboardNav {
-  constructor(private dd:Dropdown, private el:ElementRef) {
+  private dd:Dropdown;
+  private el:ElementRef;
+
+  public constructor(dd:Dropdown, el:ElementRef) {
+    this.dd = dd;
+    this.el = el;
     console.warn('keyboard-nav deprecated');
     dd.keyboardNav = true;
   }
 
-  onKeydown(event:KeyboardEvent) {
+  @HostListener('keydown', ['$event'])
+  public onKeydown(event:KeyboardEvent):void {
     if (event.which !== 40 && event.which !== 38) {
       return;
     }
@@ -48,6 +51,7 @@ export class KeyboardNav {
 
         this.dd.selectedOption--;
         break;
+      default: break;
     }
     elems[this.dd.selectedOption].nativeElement.focus();
   }
diff --git a/components/dropdown/dropdown-menu.directive.ts b/components/dropdown/dropdown-menu.directive.ts
index 94202ffff3..17f11e2256 100644
--- a/components/dropdown/dropdown-menu.directive.ts
+++ b/components/dropdown/dropdown-menu.directive.ts
@@ -1,16 +1,16 @@
-import {
-  Directive, ElementRef, Host,
-  OnInit
-} from 'angular2/core';
-
+import {Directive, ElementRef, Host, OnInit} from 'angular2/core';
 import {Dropdown} from './dropdown.directive';
 
-@Directive({ selector: '[dropdownMenu]' })
+@Directive({selector: '[dropdownMenu]'})
 export class DropdownMenu implements OnInit {
-  constructor( @Host() public dropdown: Dropdown, public el: ElementRef) {
+  public dropdown:Dropdown;
+  public el:ElementRef;
+  public constructor(@Host() dropdown:Dropdown, el:ElementRef) {
+    this.dropdown = dropdown;
+    this.el = el;
   }
 
-  public ngOnInit() {
+  public ngOnInit():void {
     this.dropdown.dropDownMenu = this;
   }
 }
diff --git a/components/dropdown/dropdown-toggle.directive.ts b/components/dropdown/dropdown-toggle.directive.ts
index 85d928aeb8..593270add5 100644
--- a/components/dropdown/dropdown-toggle.directive.ts
+++ b/components/dropdown/dropdown-toggle.directive.ts
@@ -1,33 +1,35 @@
 import {
-  Directive, ElementRef, Host,
-  OnInit, Input, HostBinding, HostListener
+  Directive, ElementRef, Host, OnInit, Input, HostBinding, HostListener
 } from 'angular2/core';
-
 import {Dropdown} from './dropdown.directive';
 
-@Directive({ selector: '[dropdownToggle]' })
+@Directive({selector: '[dropdownToggle]'})
 export class DropdownToggle implements OnInit {
   @HostBinding('class.disabled')
-  @Input() private disabled:boolean = false;
+  @Input() public disabled:boolean = false;
 
   @HostBinding('class.dropdown-toggle')
   @HostBinding('attr.aria-haspopup')
-  private addClass = true;
+  public addClass:boolean = true;
 
-  constructor(@Host() public dropdown:Dropdown, public el:ElementRef) {
+  public dropdown:Dropdown;
+  public el:ElementRef;
+  public constructor(@Host() dropdown:Dropdown, el:ElementRef) {
+    this.dropdown = dropdown;
+    this.el = el;
   }
 
-  public ngOnInit() {
+  public ngOnInit():void {
     this.dropdown.dropDownToggle = this;
   }
 
   @HostBinding('attr.aria-expanded')
-  public get isOpen() {
+  public get isOpen():boolean {
     return this.dropdown.isOpen;
   }
 
   @HostListener('click', ['$event'])
-  public toggleDropdown(event:MouseEvent) {
+  public toggleDropdown(event:MouseEvent):boolean {
     event.stopPropagation();
 
     if (!this.disabled) {
diff --git a/components/dropdown/dropdown.directive.ts b/components/dropdown/dropdown.directive.ts
index 97e9b2ae17..f6ecf4da35 100644
--- a/components/dropdown/dropdown.directive.ts
+++ b/components/dropdown/dropdown.directive.ts
@@ -1,16 +1,14 @@
 import {
-  Directive,
-  OnInit, OnDestroy, Input, Output, HostBinding,
-  EventEmitter, ElementRef, ContentChildren,
-  Query, QueryList
+  Directive, OnInit, OnDestroy, Input, Output, HostBinding, EventEmitter,
+  ElementRef
 } from 'angular2/core';
-
 import {dropdownService, NONINPUT} from './dropdown.service';
 
 @Directive({selector: '[dropdown]'})
 export class Dropdown implements OnInit, OnDestroy {
   @HostBinding('class.open')
-  @Input() public get isOpen():boolean {
+  @Input()
+  public get isOpen():boolean {
     return this._isOpen;
   }
 
@@ -21,23 +19,25 @@ export class Dropdown implements OnInit, OnDestroy {
 
   @Output() public onToggle:EventEmitter<boolean> = new EventEmitter(false);
   @Output() public isOpenChange:EventEmitter<boolean> = new EventEmitter(false);
-  @HostBinding('class.dropdown') private addClass = true;
-
+  @HostBinding('class.dropdown') public addClass:boolean = true;
 
-  private _isOpen:boolean;
   // index of selected element
   public selectedOption:number;
   // drop menu html
   public menuEl:ElementRef;
   // drop down toggle element
   public toggleEl:ElementRef;
+  public el:ElementRef;
+  private _isOpen:boolean;
 
-  constructor(public el:ElementRef,
-              @Query('dropdownMenu', {descendants: false}) dropdownMenuList:QueryList<ElementRef>) {
+  public constructor(el:ElementRef) {
+    // @Query('dropdownMenu', {descendants: false})
+    // dropdownMenuList:QueryList<ElementRef>) {
+    this.el = el;
     // todo: bind to route change event
   }
 
-  public set isOpen(value) {
+  public set isOpen(value:boolean) {
     this._isOpen = !!value;
 
     // todo: implement after porting position
@@ -45,27 +45,28 @@ export class Dropdown implements OnInit, OnDestroy {
 
     }
 
-    // todo: $animate open<->close transitions, as soon as ng2Animate will be ready
+    // todo: $animate open<->close transitions, as soon as ng2Animate will be
+    // ready
     if (this.isOpen) {
       this.focusToggleElement();
       dropdownService.open(this);
     } else {
       dropdownService.close(this);
-      this.selectedOption = null;
+      this.selectedOption = void 0;
     }
     this.onToggle.emit(this.isOpen);
     this.isOpenChange.emit(this.isOpen);
     // todo: implement call to setIsOpen if set and function
   }
 
-  ngOnInit() {
+  public ngOnInit():void {
     this.autoClose = this.autoClose || NONINPUT;
     if (this.isOpen) {
       // todo: watch for event get-isOpen?
     }
   }
 
-  ngOnDestroy() {
+  public ngOnDestroy():void {
     if (this.appendToBody && this.menuEl) {
       this.menuEl.nativeElement.remove();
     }
@@ -89,7 +90,7 @@ export class Dropdown implements OnInit, OnDestroy {
     return this.isOpen = arguments.length ? !!open : !this.isOpen;
   }
 
-  public focusDropdownEntry(keyCode:number) {
+  public focusDropdownEntry(keyCode:number):void {
     // If append to body is used.
     let hostEl = this.menuEl ?
       this.menuEl.nativeElement :
@@ -133,12 +134,14 @@ export class Dropdown implements OnInit, OnDestroy {
 
         this.selectedOption--;
         break;
+      default:
+        break;
     }
 
     elems[this.selectedOption].focus();
   }
 
-  public focusToggleElement() {
+  public focusToggleElement():void {
     if (this.toggleEl) {
       this.toggleEl.nativeElement.focus();
     }
diff --git a/components/dropdown/dropdown.interfaces.ts b/components/dropdown/dropdown.interfaces.ts
index 13d897d9c8..35643a2c25 100644
--- a/components/dropdown/dropdown.interfaces.ts
+++ b/components/dropdown/dropdown.interfaces.ts
@@ -1,10 +1,10 @@
 import {ElementRef} from 'angular2/core';
 
-export interface DropdownMenuInterface {
+export interface IDropdownMenuInterface {
   el: ElementRef;
   templateUrl: string;
 }
 
-export interface DropdownToggleInterface {
+export interface IDropdownToggleInterface {
   el: ElementRef;
 }
diff --git a/components/dropdown/dropdown.service.ts b/components/dropdown/dropdown.service.ts
index 133580a4a4..b8e4661cf0 100644
--- a/components/dropdown/dropdown.service.ts
+++ b/components/dropdown/dropdown.service.ts
@@ -11,7 +11,7 @@ export class DropdownService {
   private closeDropdownBind:EventListener = this.closeDropdown.bind(this);
   private keybindFilterBind:EventListener = this.keybindFilter.bind(this);
 
-  public open(dropdownScope:Dropdown) {
+  public open(dropdownScope:Dropdown):void {
     if (!this.openScope) {
       window.document.addEventListener('click', this.closeDropdownBind, true);
       window.document.addEventListener('keydown', this.keybindFilterBind);
@@ -24,17 +24,17 @@ export class DropdownService {
     this.openScope = dropdownScope;
   }
 
-  public close(dropdownScope:Dropdown) {
+  public close(dropdownScope:Dropdown):void {
     if (this.openScope !== dropdownScope) {
       return;
     }
 
-    this.openScope = null;
+    this.openScope = void 0;
     window.document.removeEventListener('click', this.closeDropdownBind, true);
     window.document.removeEventListener('keydown', this.keybindFilterBind);
   }
 
-  private closeDropdown(event:MouseEvent) {
+  private closeDropdown(event:MouseEvent):void {
     if (!this.openScope) {
       return;
     }
@@ -64,10 +64,10 @@ export class DropdownService {
     this.openScope.isOpen = false;
   }
 
-  private keybindFilter(event:KeyboardEvent) {
+  private keybindFilter(event:KeyboardEvent):void {
     if (event.which === 27) {
       this.openScope.focusToggleElement();
-      this.closeDropdown(null);
+      this.closeDropdown(void 0);
       return;
     }
 
diff --git a/components/ng2-bootstrap-config.ts b/components/ng2-bootstrap-config.ts
index b3f999c669..800a65285a 100644
--- a/components/ng2-bootstrap-config.ts
+++ b/components/ng2-bootstrap-config.ts
@@ -1,16 +1,18 @@
 export enum Ng2BootstrapTheme {BS3 = 1, BS4 = 2}
 
 export class Ng2BootstrapConfig {
-  private static _theme: Ng2BootstrapTheme;
-  static get theme():Ng2BootstrapTheme {
+  private static _theme:Ng2BootstrapTheme;
+
+  public static get theme():Ng2BootstrapTheme {
     // hack as for now
-    let w: any = window;
+    let w:any = window;
     if (w && w.__theme === 'bs4') {
       return Ng2BootstrapTheme.BS4;
     }
     return (this._theme || Ng2BootstrapTheme.BS3);
   }
-  static set theme(v:Ng2BootstrapTheme){
+
+  public static set theme(v:Ng2BootstrapTheme) {
     this._theme = v;
   }
 }
diff --git a/components/pagination/pager.component.ts b/components/pagination/pager.component.ts
index a20815c3bc..693fc9cb26 100644
--- a/components/pagination/pager.component.ts
+++ b/components/pagination/pager.component.ts
@@ -1,6 +1,5 @@
 import {Component, OnInit, ElementRef, Renderer, Self} from 'angular2/core';
 import {NgModel, NgClass} from 'angular2/common';
-
 import {Pagination} from './pagination.component';
 
 const pagerConfig = {
@@ -21,6 +20,7 @@ const PAGER_TEMPLATE = `
   </ul>
 `;
 
+/* tslint:disable */
 @Component({
   selector: 'pager[ngModel]',
   template: PAGER_TEMPLATE,
@@ -31,17 +31,11 @@ const PAGER_TEMPLATE = `
     'previousText', 'nextText',
   ]
 })
+/* tslint:enable */
 export class Pager extends Pagination implements OnInit {
-  public config = pagerConfig;
+  public config:any = pagerConfig;
 
-  constructor(@Self() cd:NgModel, renderer:Renderer, elementRef:ElementRef) {
+  public constructor(@Self() cd:NgModel, renderer:Renderer, elementRef:ElementRef) {
     super(cd, renderer, elementRef);
   }
 }
-// todo: pager should support only this in/out
-//inputs: [
-//  'align',
-//  'totalItems', 'itemsPerPage',
-//  'previousText', 'nextText',
-//],
-//  outputs:['numPages', 'pageChanged'],
diff --git a/components/pagination/pagination.component.ts b/components/pagination/pagination.component.ts
index 4bc390a151..bf8055a098 100644
--- a/components/pagination/pagination.component.ts
+++ b/components/pagination/pagination.component.ts
@@ -1,26 +1,28 @@
-import {Component, OnInit, Input, Output, ElementRef, EventEmitter, Self, Renderer} from 'angular2/core';
+import {
+  Component, OnInit, Input, Output, ElementRef, EventEmitter, Self, Renderer
+} from 'angular2/core';
 import {NgFor, NgIf, ControlValueAccessor, NgModel} from 'angular2/common';
 import {IAttribute} from '../common';
 
 // todo: extract base functionality classes
 // todo: expose an option to change default configuration
 export interface IPaginationConfig extends IAttribute {
-  maxSize: number;
-  itemsPerPage: number;
+  maxSize:number;
+  itemsPerPage:number;
   // is navigation buttons visible
-  boundaryLinks: boolean;
-  directionLinks: boolean;
+  boundaryLinks:boolean;
+  directionLinks:boolean;
   // labels
-  firstText: string;
-  previousText: string;
-  nextText: string;
-  lastText: string;
+  firstText:string;
+  previousText:string;
+  nextText:string;
+  lastText:string;
 
-  rotate: boolean;
+  rotate:boolean;
 }
 export interface IPageChangedEvent {
-  itemsPerPage: number;
-  page: number;
+  itemsPerPage:number;
+  page:number;
 }
 
 const paginationConfig:IPaginationConfig = {
@@ -68,12 +70,15 @@ const PAGINATION_TEMPLATE = `
   </ul>
   `;
 
+/* tslint:disable */
 @Component({
   selector: 'pagination[ngModel]',
   template: PAGINATION_TEMPLATE,
   directives: [NgFor, NgIf]
 })
+/* tslint:enable */
 export class Pagination implements ControlValueAccessor, OnInit, IPaginationConfig, IAttribute {
+  public config:any;
   @Input() public maxSize:number;
 
   @Input() public boundaryLinks:boolean;
@@ -85,12 +90,13 @@ export class Pagination implements ControlValueAccessor, OnInit, IPaginationConf
   @Input() public lastText:string;
   @Input() public rotate:boolean;
 
-  @Input() private disabled:boolean;
+  @Input() public disabled:boolean;
 
-  @Output() private numPages:EventEmitter<number> = new EventEmitter(false);
-  @Output() private pageChanged:EventEmitter<IPageChangedEvent> = new EventEmitter(false);
+  @Output() public numPages:EventEmitter<number> = new EventEmitter(false);
+  @Output() public pageChanged:EventEmitter<IPageChangedEvent> = new EventEmitter(false);
 
-  @Input() public get itemsPerPage() {
+  @Input()
+  public get itemsPerPage():number {
     return this._itemsPerPage;
   }
 
@@ -99,29 +105,21 @@ export class Pagination implements ControlValueAccessor, OnInit, IPaginationConf
     this.totalPages = this.calculateTotalPages();
   }
 
-  @Input() private get totalItems():number {
+  @Input()
+  public get totalItems():number {
     return this._totalItems;
   }
 
-  private set totalItems(v:number) {
+  public set totalItems(v:number) {
     this._totalItems = v;
     this.totalPages = this.calculateTotalPages();
   }
 
-  public config:any;
-  private classMap:string;
-
-  private _itemsPerPage:number;
-  private _totalItems:number;
-  private _totalPages:number;
-
-  private inited:boolean = false;
-
-  private get totalPages() {
+  public get totalPages():number {
     return this._totalPages;
   }
 
-  private set totalPages(v:number) {
+  public set totalPages(v:number) {
     this._totalPages = v;
     this.numPages.emit(v);
     if (this.inited) {
@@ -129,7 +127,7 @@ export class Pagination implements ControlValueAccessor, OnInit, IPaginationConf
     }
   }
 
-  public set page(value) {
+  public set page(value:number) {
     const _previous = this._page;
     this._page = (value > this.totalPages) ? this.totalPages : (value || 1);
 
@@ -143,29 +141,52 @@ export class Pagination implements ControlValueAccessor, OnInit, IPaginationConf
     });
   }
 
-  public get page() {
+  public get page():number {
     return this._page;
   }
 
+  public cd:NgModel;
+  public renderer:Renderer;
+  public elementRef:ElementRef;
+
+  private classMap:string;
+
+  private _itemsPerPage:number;
+  private _totalItems:number;
+  private _totalPages:number;
+  private inited:boolean = false;
   // ??
   private _page:number;
   private pages:Array<any>;
 
-  constructor(@Self() public cd:NgModel, public renderer:Renderer, public elementRef:ElementRef) {
+  public constructor(@Self() cd:NgModel, renderer:Renderer, elementRef:ElementRef) {
+    this.cd = cd;
+    this.renderer = renderer;
+    this.elementRef = elementRef;
     cd.valueAccessor = this;
     this.config = this.config || paginationConfig;
   }
 
-  ngOnInit() {
+  public ngOnInit():void {
     this.classMap = this.elementRef.nativeElement.getAttribute('class') || '';
     // watch for maxSize
-    this.maxSize = typeof this.maxSize !== 'undefined' ? this.maxSize : paginationConfig.maxSize;
-    this.rotate = typeof this.rotate !== 'undefined' ? this.rotate : paginationConfig.rotate;
-    this.boundaryLinks = typeof this.boundaryLinks !== 'undefined' ? this.boundaryLinks : paginationConfig.boundaryLinks;
-    this.directionLinks = typeof this.directionLinks !== 'undefined' ? this.directionLinks : paginationConfig.directionLinks;
+    this.maxSize = typeof this.maxSize !== 'undefined'
+      ? this.maxSize
+      : paginationConfig.maxSize;
+    this.rotate = typeof this.rotate !== 'undefined'
+      ? this.rotate
+      : paginationConfig.rotate;
+    this.boundaryLinks = typeof this.boundaryLinks !== 'undefined'
+      ? this.boundaryLinks
+      : paginationConfig.boundaryLinks;
+    this.directionLinks = typeof this.directionLinks !== 'undefined'
+      ? this.directionLinks
+      : paginationConfig.directionLinks;
 
     // base class
-    this.itemsPerPage = typeof this.itemsPerPage !== 'undefined' ? this.itemsPerPage : paginationConfig.itemsPerPage;
+    this.itemsPerPage = typeof this.itemsPerPage !== 'undefined'
+      ? this.itemsPerPage
+      : paginationConfig.itemsPerPage;
     this.totalPages = this.calculateTotalPages();
     // this class
     this.pages = this.getPages(this.page, this.totalPages);
@@ -173,12 +194,31 @@ export class Pagination implements ControlValueAccessor, OnInit, IPaginationConf
     this.inited = true;
   }
 
-  writeValue(value:number) {
+  public writeValue(value:number):void {
     this.page = value;
     this.pages = this.getPages(this.page, this.totalPages);
   }
 
-  private selectPage(page:number, event?:MouseEvent) {
+  public getText(key:string):string {
+    return (<IAttribute>this)[key + 'Text'] || paginationConfig[key + 'Text'];
+  }
+
+  public noPrevious():boolean {
+    return this.page === 1;
+  }
+
+  public noNext():boolean {
+    return this.page === this.totalPages;
+  }
+
+  public onChange:any = () => {};
+  public onTouched:any = () => {};
+
+  public registerOnChange(fn:(_:any) => {}):void {this.onChange = fn;}
+
+  public registerOnTouched(fn:() => {}):void {this.onTouched = fn;}
+
+  private selectPage(page:number, event?:MouseEvent):void {
     if (event) {
       event.preventDefault();
     }
@@ -193,22 +233,10 @@ export class Pagination implements ControlValueAccessor, OnInit, IPaginationConf
     }
   }
 
-  private getText(key:string):string {
-    return (<IAttribute>this)[key + 'Text'] || paginationConfig[key + 'Text'];
-  }
-
-  private noPrevious():boolean {
-    return this.page === 1;
-  }
-
-  private noNext():boolean {
-    return this.page === this.totalPages;
-  }
-
   // Create page object used in template
-  private makePage(number:number, text:string, isActive:boolean):{number: number, text: string, active: boolean} {
+  private makePage(num:number, text:string, isActive:boolean):{number:number, text:string, active:boolean} {
     return {
-      number: number,
+      number: num,
       text: text,
       active: isActive
     };
@@ -244,8 +272,8 @@ export class Pagination implements ControlValueAccessor, OnInit, IPaginationConf
     }
 
     // Add page number links
-    for (var number = startPage; number <= endPage; number++) {
-      let page = this.makePage(number, number.toString(), number === currentPage);
+    for (let num = startPage; num <= endPage; num++) {
+      let page = this.makePage(num, num.toString(), num === currentPage);
       pages.push(page);
     }
 
@@ -267,20 +295,9 @@ export class Pagination implements ControlValueAccessor, OnInit, IPaginationConf
 
   // base class
   private calculateTotalPages():number {
-    let totalPages = this.itemsPerPage < 1 ? 1 : Math.ceil(this.totalItems / this.itemsPerPage);
+    let totalPages = this.itemsPerPage < 1
+      ? 1
+      : Math.ceil(this.totalItems / this.itemsPerPage);
     return Math.max(totalPages || 0, 1);
   }
-
-  onChange = (_:any) => {
-  };
-  onTouched = () => {
-  };
-
-  registerOnChange(fn:(_:any) => {}):void {
-    this.onChange = fn;
-  }
-
-  registerOnTouched(fn:() => {}):void {
-    this.onTouched = fn;
-  }
 }
diff --git a/components/position.ts b/components/position.ts
index b9c43ddc88..655da92555 100644
--- a/components/position.ts
+++ b/components/position.ts
@@ -1,58 +1,15 @@
 import {IAttribute} from './common';
 
 export class PositionService {
-  private get window():any {
-    return window;
-  }
-
-  private get document():any {
-    return window.document;
-  }
-
-  private getStyle(nativeEl:any, cssProp:string):any {
-    // IE
-    if (nativeEl.currentStyle) {
-      return nativeEl.currentStyle[cssProp];
-    }
-
-    if (this.window.getComputedStyle) {
-      return this.window.getComputedStyle(nativeEl)[cssProp];
-    }
-    // finally try and get inline style
-    return nativeEl.style[cssProp];
-  }
-
-  /**
-   * Checks if a given element is statically positioned
-   * @param nativeEl - raw DOM element
-   */
-  private isStaticPositioned(nativeEl:any):any {
-    return (this.getStyle(nativeEl, 'position') || 'static' ) === 'static';
-  }
-
-  /**
-   * returns the closest, non-statically positioned parentOffset of a given
-   * element
-   * @param nativeEl
-   */
-  private parentOffsetEl(nativeEl:any) {
-    let offsetParent = nativeEl.offsetParent || this.document;
-    while (offsetParent && offsetParent !== this.document &&
-    this.isStaticPositioned(offsetParent)) {
-      offsetParent = offsetParent.offsetParent;
-    }
-    return offsetParent || this.document;
-  };
-
   /**
    * Provides read-only equivalent of jQuery's position function:
    * http://api.jquery.com/position/
    */
-  public position(nativeEl:any):{width:number, height:number, top:number, left:number} {
+  public position(nativeEl:HTMLElement):{width:number, height:number, top:number, left:number} {
     let elBCR = this.offset(nativeEl);
     let offsetParentBCR = {top: 0, left: 0};
     let offsetParentEl = this.parentOffsetEl(nativeEl);
-    if (offsetParentEl !== this.document) {
+    if (offsetParentEl !== this.document as any) {
       offsetParentBCR = this.offset(offsetParentEl);
       offsetParentBCR.top += offsetParentEl.clientTop - offsetParentEl.scrollTop;
       offsetParentBCR.left += offsetParentEl.clientLeft - offsetParentEl.scrollLeft;
@@ -84,7 +41,7 @@ export class PositionService {
   /**
    * Provides coordinates for the targetEl in relation to hostEl
    */
-  public positionElements(hostEl:any, targetEl:any, positionStr:any, appendToBody:any):{top:number, left:number} {
+  public positionElements(hostEl:HTMLElement, targetEl:HTMLElement, positionStr:string, appendToBody:boolean):{top:number, left:number} {
     let positionStrParts = positionStr.split('-');
     let pos0 = positionStrParts[0];
     let pos1 = positionStrParts[1] || 'center';
@@ -94,13 +51,13 @@ export class PositionService {
     let targetElWidth = targetEl.offsetWidth;
     let targetElHeight = targetEl.offsetHeight;
     let shiftWidth:IAttribute = {
-      center: function () {
+      center: function ():number {
         return hostElPos.left + hostElPos.width / 2 - targetElWidth / 2;
       },
-      left: function () {
+      left: function ():number {
         return hostElPos.left;
       },
-      right: function () {
+      right: function ():number {
         return hostElPos.left + hostElPos.width;
       }
     };
@@ -147,6 +104,49 @@ export class PositionService {
 
     return targetElPos;
   }
+
+  private get window():Window {
+    return window;
+  }
+
+  private get document():Document {
+    return window.document;
+  }
+
+  private getStyle(nativeEl:HTMLElement, cssProp:string):string {
+    // IE
+    if ((nativeEl as any).currentStyle) {
+      return (nativeEl as any).currentStyle[cssProp];
+    }
+
+    if (this.window.getComputedStyle) {
+      return (this.window.getComputedStyle(nativeEl) as IAttribute)[cssProp];
+    }
+    // finally try and get inline style
+    return (nativeEl.style as IAttribute)[cssProp];
+  }
+
+  /**
+   * Checks if a given element is statically positioned
+   * @param nativeEl - raw DOM element
+   */
+  private isStaticPositioned(nativeEl:HTMLElement):boolean {
+    return (this.getStyle(nativeEl, 'position') || 'static' ) === 'static';
+  }
+
+  /**
+   * returns the closest, non-statically positioned parentOffset of a given
+   * element
+   * @param nativeEl
+   */
+  private parentOffsetEl(nativeEl:HTMLElement):any {
+    let offsetParent:any = nativeEl.offsetParent || this.document;
+    while (offsetParent && offsetParent !== this.document &&
+    this.isStaticPositioned(offsetParent)) {
+      offsetParent = offsetParent.offsetParent;
+    }
+    return offsetParent || this.document;
+  };
 }
 
-export const positionService = new PositionService();
+export const positionService:PositionService = new PositionService();
diff --git a/components/progressbar/bar.component.ts b/components/progressbar/bar.component.ts
index f0bec5bdd8..406e2975d8 100644
--- a/components/progressbar/bar.component.ts
+++ b/components/progressbar/bar.component.ts
@@ -1,12 +1,11 @@
 import {Component, OnInit, OnDestroy, Input, Host} from 'angular2/core';
 import {NgClass, NgStyle} from 'angular2/common';
-
 import {Progress} from './progress.directive';
 
 // todo: number pipe
 // todo: use query from progress?
 @Component({
-  selector: 'bar, [bar]',
+  selector: 'bar',
   directives: [NgClass, NgStyle],
   template: `
   <div class="progress-bar"
@@ -17,14 +16,14 @@ import {Progress} from './progress.directive';
     aria-valuemin="0"
     [attr.aria-valuenow]="value"
     [attr.aria-valuetext]="percent.toFixed(0) + '%'"
-    [attr.aria-valuemax]="max"
-    ><ng-content></ng-content></div>
+    [attr.aria-valuemax]="max"><ng-content></ng-content></div>
 `
 })
 export class Bar implements OnInit, OnDestroy {
   @Input() public type:string;
 
-  @Input() public get value():number {
+  @Input()
+  public get value():number {
     return this._value;
   }
 
@@ -38,24 +37,25 @@ export class Bar implements OnInit, OnDestroy {
 
   public percent:number = 0;
   public transition:string;
+  public progress:Progress;
 
   private _value:number;
-
-  constructor(@Host() public progress:Progress) {
+  public constructor(@Host() progress:Progress) {
+    this.progress = progress;
   }
 
-  ngOnInit() {
+  public ngOnInit():void {
     this.progress.addBar(this);
   }
 
-  ngOnDestroy() {
+  public ngOnDestroy():void {
     this.progress.removeBar(this);
   }
 
-  public recalculatePercentage() {
+  public recalculatePercentage():void {
     this.percent = +(100 * this.value / this.progress.max).toFixed(2);
 
-    let totalPercentage = this.progress.bars.reduce(function (total, bar) {
+    let totalPercentage = this.progress.bars.reduce(function (total:number, bar:Bar):number {
       return total + bar.percent;
     }, 0);
 
diff --git a/components/progressbar/progress.directive.ts b/components/progressbar/progress.directive.ts
index 8e4ea4c2ae..633af8113e 100644
--- a/components/progressbar/progress.directive.ts
+++ b/components/progressbar/progress.directive.ts
@@ -8,16 +8,19 @@ const progressConfig = {
 
 // todo: progress element conflict with bootstrap.css
 // todo: need hack: replace host element with div
-@Directive({ selector: 'bs-progress, [progress]' })
+/* tslint:disable */
+@Directive({selector: 'bs-progress, [progress]'})
+/* tslint:enable */
 export class Progress implements OnInit {
   @Input() public animate:boolean;
 
   @HostBinding('attr.max')
-  @Input() public get max():number {
+  @Input()
+  public get max():number {
     return this._max;
   }
 
-  @HostBinding('class') private addClass = 'progress';
+  @HostBinding('class.progress') public addClass:boolean = true;
 
   public set max(v:number) {
     this._max = v;
@@ -30,23 +33,22 @@ export class Progress implements OnInit {
 
   private _max:number;
 
-  constructor() {
+  public constructor() {
   }
 
-  ngOnInit() {
+  public ngOnInit():void {
     this.animate = this.animate !== false;
     this.max = typeof this.max === 'number' ? this.max : progressConfig.max;
   }
 
-
-  public addBar(bar:Bar) {
+  public addBar(bar:Bar):void {
     if (!this.animate) {
       bar.transition = 'none';
     }
     this.bars.push(bar);
   }
 
-  public removeBar(bar:Bar) {
+  public removeBar(bar:Bar):void {
     this.bars.splice(this.bars.indexOf(bar), 1);
   }
 }
diff --git a/components/progressbar/progressbar.component.ts b/components/progressbar/progressbar.component.ts
index 02235dfe3e..25e0af3823 100644
--- a/components/progressbar/progressbar.component.ts
+++ b/components/progressbar/progressbar.component.ts
@@ -1,11 +1,9 @@
 import {Component, Input} from 'angular2/core';
-import { NgClass, NgStyle } from 'angular2/common';
-
 import {Progress} from './progress.directive';
 import {Bar} from './bar.component';
 
 @Component({
-  selector: 'progressbar, [progressbar]',
+  selector: 'progressbar',
   directives: [Progress, Bar],
   template: `
     <div progress [animate]="animate" [max]="max">
@@ -16,8 +14,8 @@ import {Bar} from './bar.component';
   `
 })
 export class Progressbar {
-  @Input() private animate:boolean;
-  @Input() private max:number;
-  @Input() private type:string;
-  @Input() private value:number;
+  @Input() public animate:boolean;
+  @Input() public max:number;
+  @Input() public type:string;
+  @Input() public value:number;
 }
diff --git a/components/rating/rating.component.ts b/components/rating/rating.component.ts
index 110052950c..a45dfe89f4 100644
--- a/components/rating/rating.component.ts
+++ b/components/rating/rating.component.ts
@@ -1,12 +1,12 @@
 import {
-  Component,
-  OnInit, Input, Output, HostListener,
-  Self, EventEmitter
+  Component, OnInit, Input, Output, HostListener, Self, EventEmitter
 } from 'angular2/core';
-import { NgFor, ControlValueAccessor, NgModel } from 'angular2/common';
+import {NgFor, ControlValueAccessor, NgModel} from 'angular2/common';
 
 @Component({
+  /* tslint:disable */
   selector: 'rating[ngModel]',
+  /* tslint:enable */
   directives: [NgFor],
   template: `
     <span (mouseleave)="reset()" (keydown)="onKeydown($event)" tabindex="0" role="slider" aria-valuemin="0" [attr.aria-valuemax]="range.length" [attr.aria-valuenow]="value">
@@ -18,22 +18,23 @@ import { NgFor, ControlValueAccessor, NgModel } from 'angular2/common';
   `
 })
 export class Rating implements ControlValueAccessor, OnInit {
-  @Input() private max:number;
-  @Input() private stateOn:string;
-  @Input() private stateOff:string;
-  @Input() private readonly:boolean;
-  @Input() private titles:Array<string>;
-  @Input() private ratingStates:Array<{stateOn:string, stateOff:string}>;
+  @Input() public max:number;
+  @Input() public stateOn:string;
+  @Input() public stateOff:string;
+  @Input() public readonly:boolean;
+  @Input() public titles:Array<string>;
+  @Input() public ratingStates:Array<{stateOn:string, stateOff:string}>;
 
-  @Output() private onHover:EventEmitter<number> = new EventEmitter(false);
-  @Output() private onLeave:EventEmitter<number> = new EventEmitter(false);
+  @Output() public onHover:EventEmitter<number> = new EventEmitter(false);
+  @Output() public onLeave:EventEmitter<number> = new EventEmitter(false);
 
+  public cd:NgModel;
   private range:Array<any>;
   private value:number;
   private preValue:number;
 
   @HostListener('keydown', ['$event'])
-  private onKeydown(event:KeyboardEvent) {
+  protected onKeydown(event:KeyboardEvent):void {
     if ([37, 38, 39, 40].indexOf(event.which) === -1) {
       return;
     }
@@ -44,21 +45,28 @@ export class Rating implements ControlValueAccessor, OnInit {
     this.rate(this.value + sign);
   }
 
-  constructor(@Self() public cd:NgModel) {
+  public constructor(@Self() cd:NgModel) {
+    this.cd = cd;
     cd.valueAccessor = this;
   }
 
-  ngOnInit() {
+  public ngOnInit():void {
     this.max = typeof this.max !== 'undefined' ? this.max : 5;
     this.readonly = this.readonly === true;
-    this.stateOn = typeof this.stateOn !== 'undefined' ? this.stateOn : 'glyphicon-star';
-    this.stateOff = typeof this.stateOff !== 'undefined' ? this.stateOff : 'glyphicon-star-empty';
-    this.titles = typeof this.titles !== 'undefined' && this.titles.length > 0 ? this.titles : ['one', 'two', 'three', 'four', 'five'];
+    this.stateOn = typeof this.stateOn !== 'undefined'
+      ? this.stateOn
+      : 'glyphicon-star';
+    this.stateOff = typeof this.stateOff !== 'undefined'
+      ? this.stateOff
+      : 'glyphicon-star-empty';
+    this.titles = typeof this.titles !== 'undefined' && this.titles.length > 0
+      ? this.titles
+      : ['one', 'two', 'three', 'four', 'five'];
     this.range = this.buildTemplateObjects(this.ratingStates, this.max);
   }
 
   // model -> view
-  writeValue(value:number) {
+  public writeValue(value:number):void {
     if (value % 1 !== value) {
       this.value = Math.round(value);
       this.preValue = value;
@@ -69,7 +77,27 @@ export class Rating implements ControlValueAccessor, OnInit {
     this.value = value;
   }
 
-  private buildTemplateObjects(ratingStates:Array<any>, max:number) {
+  protected enter(value:number):void {
+    if (!this.readonly) {
+      this.value = value;
+      this.onHover.emit(value);
+    }
+  }
+
+  protected reset():void {
+    this.value = this.preValue;
+    this.onLeave.emit(this.value);
+  }
+
+  public onChange:any = () => {};
+
+  public onTouched:any = () => {};
+
+  public registerOnChange(fn:(_:any) => {}):void {this.onChange = fn;}
+
+  public registerOnTouched(fn:() => {}):void {this.onTouched = fn;}
+
+  private buildTemplateObjects(ratingStates:Array<any>, max:number):Array<any> {
     ratingStates = ratingStates || [];
     let count = ratingStates.length || max;
     let result:any[] = [];
@@ -84,35 +112,10 @@ export class Rating implements ControlValueAccessor, OnInit {
     return result;
   }
 
-  private rate(value:number) {
+  private rate(value:number):void {
     if (!this.readonly && value >= 0 && value <= this.range.length) {
       this.writeValue(value);
       this.cd.viewToModelUpdate(value);
     }
   }
-
-  private enter(value:number) {
-    if (!this.readonly) {
-      this.value = value;
-      this.onHover.emit(value);
-    }
-  }
-
-  private reset() {
-    this.value = this.preValue;
-    this.onLeave.emit(this.value);
-  }
-
-  onChange = (_:any) => {
-  };
-  onTouched = () => {
-  };
-
-  registerOnChange(fn:(_:any) => {}):void {
-    this.onChange = fn;
-  }
-
-  registerOnTouched(fn:() => {}):void {
-    this.onTouched = fn;
-  }
 }
diff --git a/components/tabs/tab-heading.directive.ts b/components/tabs/tab-heading.directive.ts
index 9ef8ca2b2e..d73fe68a8d 100644
--- a/components/tabs/tab-heading.directive.ts
+++ b/components/tabs/tab-heading.directive.ts
@@ -1,9 +1,10 @@
 import {Directive, TemplateRef} from 'angular2/core';
 import {Tab} from './tab.directive';
 
-@Directive({selector: '[tab-heading]'})
+@Directive({selector: '[tabHeading]'})
 export class TabHeading {
-  constructor(public templateRef:TemplateRef, tab:Tab) {
+  public templateRef:TemplateRef;
+  public constructor(templateRef:TemplateRef, tab:Tab) {
     tab.headingRef = templateRef;
   }
 }
diff --git a/components/tabs/tab.directive.ts b/components/tabs/tab.directive.ts
index 42ae015408..20778e4b30 100644
--- a/components/tabs/tab.directive.ts
+++ b/components/tabs/tab.directive.ts
@@ -1,23 +1,20 @@
 import {
-  Directive,
-  OnInit, OnDestroy, DoCheck,
-  Input, Output, HostListener, HostBinding,
-  TemplateRef, EventEmitter
+  Directive, OnDestroy, Input, Output, HostBinding, TemplateRef, EventEmitter
 } from 'angular2/core';
-import { NgClass } from 'angular2/common';
-import { NgTransclude, IAttribute } from '../common';
 import {Tabset} from './tabset.component';
 
-// TODO: templateUrl?
+/* tslint:disable */
 @Directive({selector: 'tab, [tab]'})
+/* tslint:enable */
 export class Tab implements OnDestroy {
   @Input() public heading:string;
   @Input() public disabled:boolean;
   @Input() public removable:boolean;
 
-  /** tab active state toogle */
+  /** tab active state toggle */
   @HostBinding('class.active')
-  @Input() public get active() {
+  @Input()
+  public get active():boolean {
     return this._active;
   }
 
@@ -25,7 +22,7 @@ export class Tab implements OnDestroy {
   @Output() public deselect:EventEmitter<Tab> = new EventEmitter(false);
   @Output() public removed:EventEmitter<Tab> = new EventEmitter(false);
 
-  public set active(active) {
+  public set active(active:boolean) {
     if (this.disabled && active || !active) {
       if (!active) {
         this._active = active;
@@ -44,20 +41,20 @@ export class Tab implements OnDestroy {
     });
   }
 
-  @HostBinding('class.tab-pane') private addClass = true;
+  @HostBinding('class.tab-pane') public addClass:boolean = true;
 
-  private _active:boolean;
   public headingRef:TemplateRef;
+  public tabset:Tabset;
+  private _active:boolean;
 
-  constructor(public tabset:Tabset) {
+  public constructor(tabset:Tabset) {
+    this.tabset = tabset;
     this.tabset.addTab(this);
   }
 
-  ngOnInit() {
-    this.removable = !!this.removable;
-  }
+  public ngOnInit():void {this.removable = !!this.removable;}
 
-  ngOnDestroy() {
+  public ngOnDestroy():void {
     this.tabset.removeTab(this);
   }
 }
diff --git a/components/tabs/tabset.component.ts b/components/tabs/tabset.component.ts
index 3865b345cc..f66a356f3a 100644
--- a/components/tabs/tabset.component.ts
+++ b/components/tabs/tabset.component.ts
@@ -27,41 +27,30 @@ import {Tab} from './tab.directive';
   `
 })
 export class Tabset implements OnInit {
-  @Input() private get vertical() {
-    return this._vertical;
-  };
+  @Input()
+  public get vertical():boolean { return this._vertical;};
 
-  @Input() private get justified() {
-    return this._justified;
-  };
+  @Input()
+  public get justified():boolean { return this._justified;};
 
-  @Input() private get type() {
-    return this._type;
-  };
+  @Input()
+  public get type():string {return this._type;};
 
-  private set vertical(value) {
+  public set vertical(value:boolean) {
     this._vertical = value;
     this.setClassMap();
   }
 
-  private set justified(value) {
+  public set justified(value:boolean) {
     this._justified = value;
     this.setClassMap();
   }
 
-  private set type(value) {
+  public set type(value:string) {
     this._type = value;
     this.setClassMap();
   }
 
-  private setClassMap() {
-    this.classMap = {
-      'nav-stacked': this.vertical,
-      'nav-justified': this.justified,
-      ['nav-' + (this.type || 'tabs')]: true
-    };
-  }
-
   public tabs:Array<Tab> = [];
 
   private isDestroyed:boolean;
@@ -70,23 +59,23 @@ export class Tabset implements OnInit {
   private _type:string;
   private classMap:any = {};
 
-  constructor() {
+  public constructor() {
   }
 
-  ngOnInit() {
+  public ngOnInit():void {
     this.type = this.type !== 'undefined' ? this.type : 'tabs';
   }
 
-  ngOnDestroy() {
+  public ngOnDestroy():void {
     this.isDestroyed = true;
   }
 
-  public addTab(tab:Tab) {
+  public addTab(tab:Tab):void {
     this.tabs.push(tab);
     tab.active = this.tabs.length === 1 && tab.active !== false;
   }
 
-  public removeTab(tab:Tab) {
+  public removeTab(tab:Tab):void {
     let index = this.tabs.indexOf(tab);
     if (index === -1 || this.isDestroyed) {
       return;
@@ -101,7 +90,7 @@ export class Tabset implements OnInit {
     this.tabs.splice(index, 1);
   }
 
-  private getClosestTabIndex (index:number):number {
+  private getClosestTabIndex(index:number):number {
     let tabsLength = this.tabs.length;
     if (!tabsLength) {
       return -1;
@@ -120,7 +109,7 @@ export class Tabset implements OnInit {
     return -1;
   }
 
-  private hasAvailableTabs (index:number) {
+  private hasAvailableTabs(index:number):boolean {
     let tabsLength = this.tabs.length;
     if (!tabsLength) {
       return false;
@@ -133,4 +122,12 @@ export class Tabset implements OnInit {
     }
     return false;
   }
+
+  private setClassMap():void {
+    this.classMap = {
+      'nav-stacked': this.vertical,
+      'nav-justified': this.justified,
+      ['nav-' + (this.type || 'tabs')]: true
+    };
+  }
 }
diff --git a/components/timepicker/timepicker.component.ts b/components/timepicker/timepicker.component.ts
index 13e3e32b00..92fdac2a78 100644
--- a/components/timepicker/timepicker.component.ts
+++ b/components/timepicker/timepicker.component.ts
@@ -2,16 +2,16 @@ import {Component, OnInit, Input, Self} from 'angular2/core';
 import {NgClass, NgModel, ControlValueAccessor} from 'angular2/common';
 
 export interface ITimepickerConfig {
-  hourStep: number;
-  minuteStep: number;
-  showMeridian: boolean;
-  meridians?: any[];
-  readonlyInput: boolean;
-  mousewheel: boolean;
-  arrowkeys: boolean;
-  showSpinners: boolean;
-  min?: number;
-  max?: number;
+  hourStep:number;
+  minuteStep:number;
+  showMeridian:boolean;
+  meridians?:any[];
+  readonlyInput:boolean;
+  mousewheel:boolean;
+  arrowkeys:boolean;
+  showSpinners:boolean;
+  min?:number;
+  max?:number;
 }
 
 // todo: implement global configuration via DI
@@ -24,7 +24,7 @@ export const timepickerConfig:ITimepickerConfig = {
   hourStep: 1,
   minuteStep: 1,
   showMeridian: true,
-  meridians: null,
+  meridians: void 0,
   readonlyInput: false,
   mousewheel: true,
   arrowkeys: true,
@@ -37,20 +37,21 @@ function isDefined(value:any):boolean {
   return typeof value !== 'undefined';
 }
 
-function def(value:any, fn:Function, defaultValue:any) {
+function def(value:any, fn:Function, defaultValue:any):any {
   return fn(value) ? value : defaultValue;
 }
 
-function addMinutes(date:any, minutes:number) {
+function addMinutes(date:any, minutes:number):Date {
   let dt = new Date(date.getTime() + minutes * 60000);
   let newDate = new Date(date);
   newDate.setHours(dt.getHours(), dt.getMinutes());
   return newDate;
 }
 
-// TODO: templateUrl
 @Component({
+  /* tslint:disable */
   selector: 'timepicker[ngModel]',
+  /* tslint:enable */
   directives: [NgClass],
   template: `
     <table>
@@ -82,35 +83,37 @@ function addMinutes(date:any, minutes:number) {
   `
 })
 export class Timepicker implements ControlValueAccessor, OnInit {
+  public cd:NgModel;
   // config
-  @Input() private hourStep:number;
-  @Input() private minuteStep:number;
-  @Input() private readonlyInput:boolean;
-  @Input() private mousewheel:boolean;
-  @Input() private arrowkeys:boolean;
-  @Input() private showSpinners:boolean;
-  @Input() private min:Date;
-  @Input() private max:Date;
-  @Input() private meridians:Array<string> = ['AM', 'PM']; // ??
-
-  @Input() private get showMeridian() {
+  @Input() public hourStep:number;
+  @Input() public minuteStep:number;
+  @Input() public readonlyInput:boolean;
+  @Input() public mousewheel:boolean;
+  @Input() public arrowkeys:boolean;
+  @Input() public showSpinners:boolean;
+  @Input() public min:Date;
+  @Input() public max:Date;
+  @Input() public meridians:Array<string> = ['AM', 'PM']; // ??
+
+  @Input()
+  public get showMeridian():boolean {
     return this._showMeridian;
   }
 
-  private set showMeridian(value:boolean) {
+  public set showMeridian(value:boolean) {
     this._showMeridian = value;
     // || !this.$error.time
-    //if (true) {
+    // if (true) {
     this.updateTemplate();
     return;
-    //}
+    // }
     // Evaluate from template
     /*let hours = this.getHoursFromTemplate();
-    let minutes = this.getMinutesFromTemplate();
-    if (isDefined(hours) && isDefined(minutes)) {
-      this.selected.setHours(hours);
-      this.refresh();
-    }*/
+     let minutes = this.getMinutesFromTemplate();
+     if (isDefined(hours) && isDefined(minutes)) {
+     this.selected.setHours(hours);
+     this.refresh();
+     }*/
   }
 
   // result value
@@ -139,26 +142,28 @@ export class Timepicker implements ControlValueAccessor, OnInit {
   private invalidHours:any;
   private invalidMinutes:any;
 
-  constructor(@Self() public cd:NgModel) {
+  public constructor(@Self() cd:NgModel) {
+    this.cd = cd;
     cd.valueAccessor = this;
   }
 
   // todo: add formatter value to Date object
-  ngOnInit() {
+  public ngOnInit():void {
     // todo: take in account $locale.DATETIME_FORMATS.AMPMS;
-    this.meridians = def(this.meridians, isDefined, timepickerConfig.meridians) || ['AM', 'PM'];
+    this.meridians = def(this.meridians, isDefined, timepickerConfig.meridians) || ['AM',
+        'PM'];
     this.mousewheel = def(this.mousewheel, isDefined, timepickerConfig.mousewheel);
     if (this.mousewheel) {
-      this.setupMousewheelEvents();
+      // this.setupMousewheelEvents();
     }
     this.arrowkeys = def(this.arrowkeys, isDefined, timepickerConfig.arrowkeys);
     if (this.arrowkeys) {
-      this.setupArrowkeyEvents();
+      // this.setupArrowkeyEvents();
     }
 
     this.readonlyInput = def(this.readonlyInput, isDefined, timepickerConfig.readonlyInput);
 
-    this.setupInputEvents();
+    // this.setupInputEvents();
 
     this.hourStep = def(this.hourStep, isDefined, timepickerConfig.hourStep);
     this.minuteStep = def(this.minuteStep, isDefined, timepickerConfig.minuteStep);
@@ -169,7 +174,7 @@ export class Timepicker implements ControlValueAccessor, OnInit {
     this.showSpinners = def(this.showSpinners, isDefined, timepickerConfig.showSpinners);
   }
 
-  writeValue(v:any) {
+  public writeValue(v:any):void {
     if (v === this.selected) {
       return;
     }
@@ -177,72 +182,18 @@ export class Timepicker implements ControlValueAccessor, OnInit {
       this.selected = v;
       return;
     }
-    this.selected = v ? new Date(v) : null;
-  }
-
-  private refresh(type?:string) {
-    // this.makeValid();
-    this.updateTemplate();
-    this.cd.viewToModelUpdate(this.selected);
-  }
-
-  private updateTemplate(keyboardChange?:any) {
-    let hours = this.selected.getHours();
-    let minutes = this.selected.getMinutes();
-
-    if (this.showMeridian) {
-      // Convert 24 to 12 hour system
-      hours = (hours === 0 || hours === 12) ? 12 : hours % 12;
-    }
-
-    // this.hours = keyboardChange === 'h' ? hours : this.pad(hours);
-    // if (keyboardChange !== 'm') {
-    //  this.minutes = this.pad(minutes);
-    // }
-    this.hours = this.pad(hours);
-    this.minutes = this.pad(minutes);
-    this.meridian = this.selected.getHours() < 12 ? this.meridians[0] : this.meridians[1];
-  }
-
-  private getHoursFromTemplate() {
-    let hours = parseInt(this.hours, 10);
-    let valid = this.showMeridian ? (hours > 0 && hours < 13) : (hours >= 0 && hours < 24);
-    if (!valid) {
-      return undefined;
-    }
-
-    if (this.showMeridian) {
-      if (hours === 12) {
-        hours = 0;
-      }
-      if (this.meridian === this.meridians[1]) {
-        hours = hours + 12;
-      }
-    }
-    return hours;
-  }
-
-  private getMinutesFromTemplate() {
-    let minutes = parseInt(this.minutes, 10);
-    return (minutes >= 0 && minutes < 60) ? minutes : undefined;
+    this.selected = v ? new Date(v) : void 0;
   }
 
-  private pad(value:any) {
-    return (isDefined(value) && value.toString().length < 2) ? '0' + value : value.toString();
-  }
+  public onChange:any = () => {};
 
+  public onTouched:any = () => {};
 
-  private setupMousewheelEvents() {
-  }
+  public registerOnChange(fn:(_:any) => {}):void {this.onChange = fn;}
 
-  private setupArrowkeyEvents() {
-  }
+  public registerOnTouched(fn:() => {}):void {this.onTouched = fn;}
 
-  private setupInputEvents() {
-
-  }
-
-  private updateHours() {
+  protected updateHours():void {
     if (this.readonlyInput) {
       return;
     }
@@ -260,11 +211,11 @@ export class Timepicker implements ControlValueAccessor, OnInit {
       // todo: validation?
       // invalidate(true);
     } else {
-      this.refresh('h');
+      this.refresh(/*'h'*/);
     }
   }
 
-  private hoursOnBlur(event:Event) {
+  protected hoursOnBlur(/*event:Event*/):void {
     if (this.readonlyInput) {
       return;
     }
@@ -275,7 +226,7 @@ export class Timepicker implements ControlValueAccessor, OnInit {
     }
   }
 
-  private updateMinutes() {
+  protected updateMinutes():void {
     if (this.readonlyInput) {
       return;
     }
@@ -293,11 +244,11 @@ export class Timepicker implements ControlValueAccessor, OnInit {
       // todo: validation
       // invalidate(undefined, true);
     } else {
-      this.refresh('m');
+      this.refresh(/*'m'*/);
     }
   }
 
-  private minutesOnBlur(event:Event) {
+  protected minutesOnBlur(/*event:Event*/):void {
     if (this.readonlyInput) {
       return;
     }
@@ -307,85 +258,129 @@ export class Timepicker implements ControlValueAccessor, OnInit {
     }
   }
 
-  private noIncrementHours() {
+  protected incrementHours():void {
+    if (!this.noIncrementHours()) {
+      this.addMinutesToSelected(this.hourStep * 60);
+    }
+  }
+
+  protected decrementHours():void {
+    if (!this.noDecrementHours()) {
+      this.addMinutesToSelected(-this.hourStep * 60);
+    }
+  }
+
+  protected incrementMinutes():void {
+    if (!this.noIncrementMinutes()) {
+      this.addMinutesToSelected(this.minuteStep);
+    }
+  }
+
+  protected decrementMinutes():void {
+    if (!this.noDecrementMinutes()) {
+      this.addMinutesToSelected(-this.minuteStep);
+    }
+  }
+
+  protected toggleMeridian():void {
+    if (!this.noToggleMeridian()) {
+      let sign = this.selected.getHours() < 12 ? 1 : -1;
+      this.addMinutesToSelected(12 * 60 * sign);
+    }
+  }
+
+  private refresh(/*type?:string*/):void {
+    // this.makeValid();
+    this.updateTemplate();
+    this.cd.viewToModelUpdate(this.selected);
+  }
+
+  private updateTemplate(/*keyboardChange?:any*/):void {
+    let hours = this.selected.getHours();
+    let minutes = this.selected.getMinutes();
+
+    if (this.showMeridian) {
+      // Convert 24 to 12 hour system
+      hours = (hours === 0 || hours === 12) ? 12 : hours % 12;
+    }
+
+    // this.hours = keyboardChange === 'h' ? hours : this.pad(hours);
+    // if (keyboardChange !== 'm') {
+    //  this.minutes = this.pad(minutes);
+    // }
+    this.hours = this.pad(hours);
+    this.minutes = this.pad(minutes);
+    this.meridian = this.selected.getHours() < 12
+      ? this.meridians[0]
+      : this.meridians[1];
+  }
+
+  private getHoursFromTemplate():number {
+    let hours = parseInt(this.hours, 10);
+    let valid = this.showMeridian
+      ? (hours > 0 && hours < 13)
+      : (hours >= 0 && hours < 24);
+    if (!valid) {
+      return void 0;
+    }
+
+    if (this.showMeridian) {
+      if (hours === 12) {
+        hours = 0;
+      }
+      if (this.meridian === this.meridians[1]) {
+        hours = hours + 12;
+      }
+    }
+    return hours;
+  }
+
+  private getMinutesFromTemplate():number {
+    let minutes = parseInt(this.minutes, 10);
+    return (minutes >= 0 && minutes < 60) ? minutes : undefined;
+  }
+
+  private pad(value:string|number):string {
+    return (isDefined(value) && value.toString().length < 2)
+      ? '0' + value
+      : value.toString();
+  }
+
+  private noIncrementHours():boolean {
     let incrementedSelected = addMinutes(this.selected, this.hourStep * 60);
     return incrementedSelected > this.max ||
       (incrementedSelected < this.selected && incrementedSelected < this.min);
   }
 
-  private noDecrementHours() {
+  private noDecrementHours():boolean {
     let decrementedSelected = addMinutes(this.selected, -this.hourStep * 60);
     return decrementedSelected < this.min ||
       (decrementedSelected > this.selected && decrementedSelected > this.max);
   }
 
-  private noIncrementMinutes() {
+  private noIncrementMinutes():boolean {
     let incrementedSelected = addMinutes(this.selected, this.minuteStep);
     return incrementedSelected > this.max ||
       (incrementedSelected < this.selected && incrementedSelected < this.min);
   }
 
-  private noDecrementMinutes() {
+  private noDecrementMinutes():boolean {
     let decrementedSelected = addMinutes(this.selected, -this.minuteStep);
     return decrementedSelected < this.min ||
       (decrementedSelected > this.selected && decrementedSelected > this.max);
 
   }
 
-  private addMinutesToSelected(minutes:any) {
+  private addMinutesToSelected(minutes:any):void {
     this.selected = addMinutes(this.selected, minutes);
     this.refresh();
   }
 
-  noToggleMeridian() {
+  private noToggleMeridian():boolean {
     if (this.selected.getHours() < 13) {
       return addMinutes(this.selected, 12 * 60) > this.max;
     } else {
       return addMinutes(this.selected, -12 * 60) < this.min;
     }
   }
-
-  private incrementHours() {
-    if (!this.noIncrementHours()) {
-      this.addMinutesToSelected(this.hourStep * 60);
-    }
-  }
-
-  private decrementHours() {
-    if (!this.noDecrementHours()) {
-      this.addMinutesToSelected(-this.hourStep * 60);
-    }
-  }
-
-  private incrementMinutes() {
-    if (!this.noIncrementMinutes()) {
-      this.addMinutesToSelected(this.minuteStep);
-    }
-  }
-
-  private decrementMinutes() {
-    if (!this.noDecrementMinutes()) {
-      this.addMinutesToSelected(-this.minuteStep);
-    }
-  }
-
-  private toggleMeridian() {
-    if (!this.noToggleMeridian()) {
-      let sign = this.selected.getHours() < 12 ? 1 : -1;
-      this.addMinutesToSelected(12 * 60 * sign);
-    }
-  }
-
-  onChange = (_:any) => {
-  };
-  onTouched = () => {
-  };
-
-  registerOnChange(fn:(_:any) => {}):void {
-    this.onChange = fn;
-  }
-
-  registerOnTouched(fn:() => {}):void {
-    this.onTouched = fn;
-  }
 }
diff --git a/components/tooltip/tooltip-container.component.ts b/components/tooltip/tooltip-container.component.ts
index 78a1b56510..f9a86ddee5 100644
--- a/components/tooltip/tooltip-container.component.ts
+++ b/components/tooltip/tooltip-container.component.ts
@@ -1,4 +1,6 @@
-import {Component, ChangeDetectorRef, ElementRef, Inject, AfterViewInit} from 'angular2/core';
+import {
+  Component, ChangeDetectorRef, ElementRef, Inject, AfterViewInit
+} from 'angular2/core';
 import {NgClass, NgStyle} from 'angular2/common';
 import {positionService} from '../position';
 import {TooltipOptions} from './tooltip-options.class';
@@ -17,6 +19,7 @@ import {TooltipOptions} from './tooltip-options.class';
     </div>`
 })
 export class TooltipContainer implements AfterViewInit {
+  /* tslint:disable */
   private classMap:any;
   private top:string = '-1000px';
   private left:string = '-1000px';
@@ -28,16 +31,22 @@ export class TooltipContainer implements AfterViewInit {
   private isOpen:boolean;
   private appendToBody:boolean;
   private hostEl:ElementRef;
+  /* tslint:enable */
 
-  constructor(private element:ElementRef,
-              private cdr:ChangeDetectorRef,
-              @Inject(TooltipOptions) options:TooltipOptions) {
+  private element:ElementRef;
+  private cdr:ChangeDetectorRef;
+
+  public constructor(element:ElementRef,
+                     cdr:ChangeDetectorRef,
+                     @Inject(TooltipOptions) options:TooltipOptions) {
+    this.element = element;
+    this.cdr = cdr;
     Object.assign(this, options);
     this.classMap = {'in': false, 'fade': false};
     this.classMap[options.placement] = true;
   }
 
-  ngAfterViewInit() {
+  public ngAfterViewInit():void {
     let p = positionService
       .positionElements(
         this.hostEl.nativeElement,
diff --git a/components/tooltip/tooltip-options.class.ts b/components/tooltip/tooltip-options.class.ts
index 34ab381423..760e655f47 100644
--- a/components/tooltip/tooltip-options.class.ts
+++ b/components/tooltip/tooltip-options.class.ts
@@ -7,7 +7,7 @@ export class TooltipOptions {
   public animation:boolean;
   public isOpen:boolean;
 
-  constructor(options:Object) {
+  public constructor(options:Object) {
     Object.assign(this, options);
   }
 }
diff --git a/components/tooltip/tooltip.directive.ts b/components/tooltip/tooltip.directive.ts
index dcb2c165ab..5908a9ba20 100644
--- a/components/tooltip/tooltip.directive.ts
+++ b/components/tooltip/tooltip.directive.ts
@@ -1,31 +1,40 @@
-import {Directive, OnInit, Input, HostListener, ElementRef, DynamicComponentLoader, ComponentRef, Provider, Injector} from 'angular2/core';
+import {
+  Directive, OnInit, Input, HostListener, ElementRef, DynamicComponentLoader,
+  ComponentRef, Provider, Injector
+} from 'angular2/core';
 import {TooltipOptions} from './tooltip-options.class';
 import {TooltipContainer} from './tooltip-container.component';
 
 @Directive({selector: '[tooltip]'})
 export class Tooltip implements OnInit {
+  /* tslint:disable */
   @Input('tooltip') public content:string;
   @Input('tooltipPlacement') public placement:string = 'top';
   @Input('tooltipIsOpen') public isOpen:boolean;
   @Input('tooltipEnable') public enable:boolean;
   @Input('tooltipAnimation') public animation:boolean = true;
   @Input('tooltipAppendToBody') public appendToBody:boolean;
+  /* tslint:enable */
+
+  public element:ElementRef;
+  public loader:DynamicComponentLoader;
 
   private visible:boolean = false;
   private tooltip:Promise<ComponentRef>;
 
-  constructor(public element:ElementRef,
-              public loader:DynamicComponentLoader) {
+  public constructor(element:ElementRef, loader:DynamicComponentLoader) {
+    this.element = element;
+    this.loader = loader;
   }
 
-  ngOnInit() {
+  public ngOnInit():void {
   }
 
   // todo: filter triggers
   // params: event, target
   @HostListener('focusin', ['$event', '$target'])
   @HostListener('mouseenter', ['$event', '$target'])
-  show() {
+  public show():void {
     if (this.visible) {
       return;
     }
@@ -51,7 +60,7 @@ export class Tooltip implements OnInit {
   // params event, target
   @HostListener('focusout', ['$event', '$target'])
   @HostListener('mouseleave', ['$event', '$target'])
-  hide() {
+  public hide():void {
     if (!this.visible) {
       return;
     }
diff --git a/components/typeahead.ts b/components/typeahead.ts
index f382f98b43..d305efa9fb 100644
--- a/components/typeahead.ts
+++ b/components/typeahead.ts
@@ -1,6 +1,5 @@
 import {Typeahead} from './typeahead/typeahead.directive';
 import {TypeaheadContainer} from './typeahead/typeahead-container.component';
-import {TypeaheadOptions} from './typeahead/typeahead-options.class';
 
 export {Typeahead} from './typeahead/typeahead.directive';
 export {TypeaheadContainer} from './typeahead/typeahead-container.component';
diff --git a/components/typeahead/typeahead-container.component.ts b/components/typeahead/typeahead-container.component.ts
index 1c3bc9835a..9be9b3ad32 100644
--- a/components/typeahead/typeahead-container.component.ts
+++ b/components/typeahead/typeahead-container.component.ts
@@ -6,7 +6,6 @@ import {TypeaheadOptions} from './typeahead-options.class';
 import {positionService} from '../position';
 import {Ng2BootstrapConfig, Ng2BootstrapTheme} from '../ng2-bootstrap-config';
 
-
 const TEMPLATE:any = {
   [Ng2BootstrapTheme.BS4]: `
   <div class="dropdown-menu"
@@ -43,6 +42,7 @@ const TEMPLATE:any = {
 export class TypeaheadContainer {
   public parent:Typeahead;
   public query:any;
+  public element:ElementRef;
   private _matches:Array<any> = [];
   private _field:string;
   private _active:any;
@@ -51,7 +51,8 @@ export class TypeaheadContainer {
   private display:string;
   private placement:string;
 
-  constructor(public element:ElementRef, options:TypeaheadOptions) {
+  public constructor(element:ElementRef, options:TypeaheadOptions) {
+    this.element = element;
     Object.assign(this, options);
   }
 
@@ -71,7 +72,7 @@ export class TypeaheadContainer {
     this._field = value;
   }
 
-  public position(hostEl:ElementRef) {
+  public position(hostEl:ElementRef):void {
     this.display = 'block';
     this.top = '0px';
     this.left = '0px';
@@ -83,44 +84,35 @@ export class TypeaheadContainer {
     this.left = p.left + 'px';
   }
 
-  public selectActiveMatch() {
+  public selectActiveMatch():void {
     this.selectMatch(this._active);
   }
 
-  public prevActiveMatch() {
+  public prevActiveMatch():void {
     let index = this.matches.indexOf(this._active);
-    this._active = this.matches[index - 1 < 0 ? this.matches.length - 1 : index - 1];
+    this._active = this.matches[index - 1 < 0
+      ? this.matches.length - 1
+      : index - 1];
   }
 
-  public nextActiveMatch() {
+  public nextActiveMatch():void {
     let index = this.matches.indexOf(this._active);
-    this._active = this.matches[index + 1 > this.matches.length - 1 ? 0 : index + 1];
+    this._active = this.matches[index + 1 > this.matches.length - 1
+      ? 0
+      : index + 1];
   }
 
-  private selectActive(value:any) {
+  protected selectActive(value:any):void {
     this._active = value;
   }
 
-  private isActive(value:any):boolean {
-    return this._active === value;
-  }
-
-  private selectMatch(value:any, e:Event = null) {
-    if (e) {
-      e.stopPropagation();
-      e.preventDefault();
-    }
-
-    this.parent.changeModel(value);
-    this.parent.typeaheadOnSelect.emit({
-      item: value
-    });
-    return false;
-  }
-
-  private hightlight(item:any, query:string) {
-    let itemStr:string = (typeof item === 'object' && this._field ? item[this._field] : item).toString();
-    let itemStrHelper:string = (this.parent.typeaheadLatinize ? TypeaheadUtils.latinize(itemStr) : itemStr).toLowerCase();
+  protected hightlight(item:any, query:string):string {
+    let itemStr:string = (typeof item === 'object' && this._field
+      ? item[this._field]
+      : item).toString();
+    let itemStrHelper:string = (this.parent.typeaheadLatinize
+      ? TypeaheadUtils.latinize(itemStr)
+      : itemStr).toLowerCase();
     let startIdx:number;
     let tokenLen:number;
 
@@ -147,4 +139,21 @@ export class TypeaheadContainer {
 
     return itemStr;
   }
+
+  public isActive(value:any):boolean {
+    return this._active === value;
+  }
+
+  private selectMatch(value:any, e:Event = void 0):boolean {
+    if (e) {
+      e.stopPropagation();
+      e.preventDefault();
+    }
+
+    this.parent.changeModel(value);
+    this.parent.typeaheadOnSelect.emit({
+      item: value
+    });
+    return false;
+  }
 }
diff --git a/components/typeahead/typeahead-options.class.ts b/components/typeahead/typeahead-options.class.ts
index bd1f39e2bf..8ac5067fe0 100644
--- a/components/typeahead/typeahead-options.class.ts
+++ b/components/typeahead/typeahead-options.class.ts
@@ -2,7 +2,7 @@ export class TypeaheadOptions {
   public placement:string;
   public animation:boolean;
 
-  constructor(options:TypeaheadOptions) {
+  public constructor(options:TypeaheadOptions) {
     Object.assign(this, options);
   }
 }
diff --git a/components/typeahead/typeahead-utils.ts b/components/typeahead/typeahead-utils.ts
index 083a9e4c9b..023473318a 100644
--- a/components/typeahead/typeahead-utils.ts
+++ b/components/typeahead/typeahead-utils.ts
@@ -1,21 +1,24 @@
-import { latinMap } from './latin-map';
+import {latinMap} from './latin-map';
 
 export class TypeaheadUtils {
-  static latinMap:any = latinMap;
+  public static latinMap:any = latinMap;
 
-  public static latinize(str:string) {
-    return str.replace(/[^A-Za-z0-9\[\] ]/g, function (a) {
+  public static latinize(str:string):string {
+    return str.replace(/[^A-Za-z0-9\[\] ]/g, function (a:string):string {
       return TypeaheadUtils.latinMap[a] || a;
     });
   }
 
-  public static escapeRegexp(queryToEscape:string) {
-    // Regex: capture the whole query string and replace it with the string that will be used to match
-    // the results, for example if the capture is 'a' the result will be \a
+  public static escapeRegexp(queryToEscape:string):string {
+    // Regex: capture the whole query string and replace it with the string
+    // that will be used to match the results, for example if the capture is
+    // 'a' the result will be \a
     return queryToEscape.replace(/([.?*+^$[\]\\(){}|-])/g, '\\$1');
   }
 
-  public static tokenize(str:string, wordRegexDelimiters:string = ' ', phraseRegexDelimiters:string = ''):Array<string> {
+  /* tslint:disable */
+  public static tokenize(str:string, wordRegexDelimiters = ' ', phraseRegexDelimiters = ''):Array<string> {
+    /* tslint:enable */
     let regexStr:string = '(?:[' + phraseRegexDelimiters + '])([^' + phraseRegexDelimiters + ']+)(?:[' + phraseRegexDelimiters + '])|([^' + wordRegexDelimiters + ']+)';
     let preTokenized:Array<string> = str.split(new RegExp(regexStr, 'g'));
     let result:Array<string> = [];
diff --git a/components/typeahead/typeahead.directive.ts b/components/typeahead/typeahead.directive.ts
index a1e9b44f6d..c2a0f199c2 100644
--- a/components/typeahead/typeahead.directive.ts
+++ b/components/typeahead/typeahead.directive.ts
@@ -1,49 +1,44 @@
 import {
-  Directive, Input, Output, HostListener,
-  EventEmitter, OnInit,
-  ElementRef, Renderer,
-  DynamicComponentLoader, ComponentRef, Provider, Injector
+  Directive, Input, Output, HostListener, EventEmitter, OnInit, ElementRef,
+  Renderer, DynamicComponentLoader, ComponentRef, Provider, Injector
 } from 'angular2/core';
-import {NgModel}from 'angular2/common';
+import {NgModel} from 'angular2/common';
+import {TypeaheadUtils} from './typeahead-utils';
+import {TypeaheadContainer} from './typeahead-container.component';
+import {TypeaheadOptions} from './typeahead-options.class';
 
 // https://github.com/angular/angular/blob/master/modules/angular2/src/core/forms/directives/shared.ts
-function setProperty(renderer:Renderer, elementRef:ElementRef, propName:string, propValue:any) {
+function setProperty(renderer:Renderer, elementRef:ElementRef, propName:string, propValue:any):void {
   renderer.setElementProperty(elementRef.nativeElement, propName, propValue);
 }
 
-import {Ng2BootstrapConfig, Ng2BootstrapTheme} from '../ng2-bootstrap-config';
-import {positionService} from '../position';
-import {TypeaheadUtils} from './typeahead-utils';
-import {TypeaheadContainer} from './typeahead-container.component';
-import {TypeaheadOptions} from './typeahead-options.class';
-
 @Directive({
-  selector: 'typeahead[ngModel], [ngModel][typeahead]'
+  selector: '[typeahead][ngModel]'
 })
 export class Typeahead implements OnInit {
   @Output() public typeaheadLoading:EventEmitter<boolean> = new EventEmitter(false);
   @Output() public typeaheadNoResults:EventEmitter<boolean> = new EventEmitter(false);
-  @Output() public typeaheadOnSelect:EventEmitter<{item: any}> = new EventEmitter(false);
+  @Output() public typeaheadOnSelect:EventEmitter<{item:any}> = new EventEmitter(false);
 
   @Input() public typeahead:any;
   @Input() public typeaheadMinLength:number;
   @Input() public typeaheadWaitMs:number;
   @Input() public typeaheadOptionsLimit:number;
   @Input() public typeaheadOptionField:string;
-  @Input() public typeaheadAsync:boolean = null;
+  @Input() public typeaheadAsync:boolean = void 0;
   @Input() public typeaheadLatinize:boolean = true;
   @Input() public typeaheadSingleWords:boolean = true;
   @Input() public typeaheadWordDelimiters:string = ' ';
   @Input() public typeaheadPhraseDelimiters:string = '\'"';
 
   // not yet implemented
-  @Input() private typeaheadAppendToBody:boolean;
-  @Input() private typeaheadEditable:boolean;
-  @Input() private typeaheadFocusFirst:boolean;
-  @Input() private typeaheadInputFormatter:any;
-  @Input() private typeaheadSelectOnExact:boolean;
-  @Input() private typeaheadSelectOnBlur:boolean;
-  @Input() private typeaheadFocusOnSelect:boolean;
+  // @Input() private typeaheadAppendToBody:boolean;
+  // @Input() private typeaheadEditable:boolean;
+  // @Input() private typeaheadFocusFirst:boolean;
+  // @Input() private typeaheadInputFormatter:any;
+  // @Input() private typeaheadSelectOnExact:boolean;
+  // @Input() private typeaheadSelectOnBlur:boolean;
+  // @Input() private typeaheadFocusOnSelect:boolean;
 
   public container:TypeaheadContainer;
 
@@ -52,13 +47,173 @@ export class Typeahead implements OnInit {
   private placement:string = 'bottom-left';
   private popup:Promise<ComponentRef>;
 
-  constructor(private cd:NgModel,
-              private element:ElementRef,
-              private renderer:Renderer,
-              private loader:DynamicComponentLoader) {
+  private cd:NgModel;
+  private element:ElementRef;
+  private renderer:Renderer;
+  private loader:DynamicComponentLoader;
+
+  @HostListener('keyup', ['$event'])
+  protected onChange(e:KeyboardEvent):void {
+    if (this.container) {
+      // esc
+      if (e.keyCode === 27) {
+        this.hide();
+        return;
+      }
+
+      // up
+      if (e.keyCode === 38) {
+        this.container.prevActiveMatch();
+        return;
+      }
+
+      // down
+      if (e.keyCode === 40) {
+        this.container.nextActiveMatch();
+        return;
+      }
+
+      // enter
+      if (e.keyCode === 13) {
+        this.container.selectActiveMatch();
+        return;
+      }
+    }
+
+    // Ensure that we have typed enough characters before triggering the
+    // matchers
+    if (this.cd.model.toString().length >= this.typeaheadMinLength) {
+
+      this.typeaheadLoading.emit(true);
+
+      if (this.typeaheadAsync === true) {
+        this.debouncer();
+      }
+
+      if (this.typeaheadAsync === false) {
+        this.processMatches();
+        this.finalizeAsyncCall();
+      }
+    } else {
+      // Not enough characters typed? Hide the popup.
+      this.hide();
+    }
+  }
+
+  @HostListener('blur', ['$event.target'])
+  protected onBlur():void {
+    this.hide();
+  }
+
+  @HostListener('keydown', ['$event'])
+  protected onKeydown(e:KeyboardEvent):void {
+    // When typeahead container is visible, prevent submitting the form
+    if (this.container && e.keyCode === 13) {
+      e.preventDefault();
+    }
+  }
+
+  public constructor(cd:NgModel, element:ElementRef,
+                     renderer:Renderer, loader:DynamicComponentLoader) {
+    this.cd = cd;
+    this.element = element;
+    this.renderer = renderer;
+    this.loader = loader;
+  }
+
+  public ngOnInit():void {
+    this.typeaheadOptionsLimit = this.typeaheadOptionsLimit || 20;
+    this.typeaheadMinLength = this.typeaheadMinLength || 1;
+    this.typeaheadWaitMs = this.typeaheadWaitMs || 0;
+
+    // async should be false in case of array
+    if (this.typeaheadAsync === void 0 && typeof this.typeahead !== 'function') {
+      this.typeaheadAsync = false;
+    }
+
+    // async should be true for any case of function
+    if (typeof this.typeahead === 'function') {
+      this.typeaheadAsync = true;
+    }
+
+    if (this.typeaheadAsync === true) {
+      this.debouncer = this.debounce(() => {
+        if (typeof this.typeahead === 'function') {
+          this.typeahead()
+            .then((matches:any[]) => {
+              this._matches = [];
+
+              for (let i = 0; i < matches.length; i++) {
+                this._matches.push(matches[i]);
+                if (this._matches.length > this.typeaheadOptionsLimit - 1) {
+                  break;
+                }
+              }
+
+              this.finalizeAsyncCall();
+            });
+        }
+
+        // source is array
+        if (typeof this.typeahead === 'object' && this.typeahead.length) {
+          this.processMatches();
+          this.finalizeAsyncCall();
+        }
+      }, 100);
+    }
+  }
+
+  public show(matches:Array<any>):void {
+    let options = new TypeaheadOptions({
+      placement: this.placement,
+      animation: false
+    });
+
+    let binding = Injector.resolve([
+      new Provider(TypeaheadOptions, {useValue: options})
+    ]);
+
+    this.popup = this.loader
+      .loadNextToLocation(TypeaheadContainer, this.element, binding)
+      .then((componentRef:ComponentRef) => {
+        componentRef.instance.position(this.element);
+        this.container = componentRef.instance;
+        this.container.parent = this;
+        // This improves the speedas it won't have to be done for each list item
+        let normalizedQuery = (this.typeaheadLatinize
+          ? TypeaheadUtils.latinize(this.cd.model)
+          : this.cd.model).toString()
+          .toLowerCase();
+        this.container.query = this.typeaheadSingleWords
+          ? TypeaheadUtils.tokenize(normalizedQuery, this.typeaheadWordDelimiters, this.typeaheadPhraseDelimiters)
+          : normalizedQuery;
+        this.container.matches = matches;
+        this.container.field = this.typeaheadOptionField;
+        this.element.nativeElement.focus();
+        return componentRef;
+      });
+  }
+
+  public hide():void {
+    if (this.container) {
+      this.popup.then((componentRef:ComponentRef) => {
+        componentRef.dispose();
+        this.container = void 0;
+        return componentRef;
+      });
+    }
+  }
+
+  public changeModel(value:any):void {
+    let valueStr:string = ((typeof value === 'object' && this.typeaheadOptionField)
+      ? value[this.typeaheadOptionField]
+      : value).toString();
+    this.cd.viewToModelUpdate(valueStr);
+    setProperty(this.renderer, this.element, 'value', valueStr);
+    this.hide();
   }
 
-  public get matches() {
+  public get matches():Array<any> {
     return this._matches;
   }
 
@@ -68,7 +223,7 @@ export class Typeahead implements OnInit {
     let timestamp:number;
     let waitOriginal:number = wait;
 
-    return function () {
+    return function ():void {
       // save details of latest call
       args = [].slice.call(arguments, 0);
       timestamp = Date.now();
@@ -80,7 +235,7 @@ export class Typeahead implements OnInit {
       wait = this.container ? waitOriginal : this.typeaheadWaitMs;
 
       // this is where the magic happens
-      let later = function () {
+      let later = function ():void {
 
         // how long ago was the last call
         let last = Date.now() - timestamp;
@@ -91,7 +246,7 @@ export class Typeahead implements OnInit {
           timeout = setTimeout(later, wait - last);
           // or if not we can null out the timer and run the latest
         } else {
-          timeout = null;
+          timeout = void 0;
           func.apply(this, args);
         }
       };
@@ -103,27 +258,36 @@ export class Typeahead implements OnInit {
     };
   }
 
-  private processMatches() {
-
+  private processMatches():void {
     this._matches = [];
 
     if (!this.typeahead) {
       return;
     }
 
-    // If singleWords, break model here to not be doing extra work on each iteration
-    let normalizedQuery = (this.typeaheadLatinize ? TypeaheadUtils.latinize(this.cd.model) : this.cd.model).toString().toLowerCase();
-    normalizedQuery = this.typeaheadSingleWords ? TypeaheadUtils.tokenize(normalizedQuery, this.typeaheadWordDelimiters, this.typeaheadPhraseDelimiters) : normalizedQuery;
+    // If singleWords, break model here to not be doing extra work on each
+    // iteration
+    let normalizedQuery = (this.typeaheadLatinize
+      ? TypeaheadUtils.latinize(this.cd.model)
+      : this.cd.model).toString()
+      .toLowerCase();
+    normalizedQuery = this.typeaheadSingleWords
+      ? TypeaheadUtils.tokenize(normalizedQuery, this.typeaheadWordDelimiters, this.typeaheadPhraseDelimiters)
+      : normalizedQuery;
     for (let i = 0; i < this.typeahead.length; i++) {
       let match:string;
 
       if (typeof this.typeahead[i] === 'object' &&
         this.typeahead[i][this.typeaheadOptionField]) {
-        match = this.typeaheadLatinize ? TypeaheadUtils.latinize(this.typeahead[i][this.typeaheadOptionField].toString()) : this.typeahead[i][this.typeaheadOptionField].toString();
+        match = this.typeaheadLatinize
+          ? TypeaheadUtils.latinize(this.typeahead[i][this.typeaheadOptionField].toString())
+          : this.typeahead[i][this.typeaheadOptionField].toString();
       }
 
       if (typeof this.typeahead[i] === 'string') {
-        match = this.typeaheadLatinize ? TypeaheadUtils.latinize(this.typeahead[i].toString()) : this.typeahead[i].toString();
+        match = this.typeaheadLatinize
+          ? TypeaheadUtils.latinize(this.typeahead[i].toString())
+          : this.typeahead[i].toString();
       }
 
       if (!match) {
@@ -141,7 +305,7 @@ export class Typeahead implements OnInit {
 
   }
 
-  private testMatch(match:string, test:any) {
+  private testMatch(match:string, test:any):boolean {
     let spaceLength:number;
 
     if (typeof test === 'object') {
@@ -157,7 +321,7 @@ export class Typeahead implements OnInit {
     }
   }
 
-  private finalizeAsyncCall() {
+  private finalizeAsyncCall():void {
     this.typeaheadLoading.emit(false);
     this.typeaheadNoResults.emit(this.cd.model.toString().length >=
       this.typeaheadMinLength && this.matches.length <= 0);
@@ -169,8 +333,13 @@ export class Typeahead implements OnInit {
 
     if (this.container && this._matches.length > 0) {
       // This improves the speedas it won't have to be done for each list item
-      let normalizedQuery = (this.typeaheadLatinize ? TypeaheadUtils.latinize(this.cd.model) : this.cd.model).toString().toLowerCase();
-      this.container.query = this.typeaheadSingleWords ? TypeaheadUtils.tokenize(normalizedQuery, this.typeaheadWordDelimiters, this.typeaheadPhraseDelimiters) : normalizedQuery;
+      let normalizedQuery = (this.typeaheadLatinize
+        ? TypeaheadUtils.latinize(this.cd.model)
+        : this.cd.model).toString()
+        .toLowerCase();
+      this.container.query = this.typeaheadSingleWords
+        ? TypeaheadUtils.tokenize(normalizedQuery, this.typeaheadWordDelimiters, this.typeaheadPhraseDelimiters)
+        : normalizedQuery;
       this.container.matches = this._matches;
     }
 
@@ -178,148 +347,4 @@ export class Typeahead implements OnInit {
       this.show(this._matches);
     }
   }
-
-  ngOnInit() {
-    this.typeaheadOptionsLimit = this.typeaheadOptionsLimit || 20;
-    this.typeaheadMinLength = this.typeaheadMinLength || 1;
-    this.typeaheadWaitMs = this.typeaheadWaitMs || 0;
-
-    // async should be false in case of array
-    if (this.typeaheadAsync === null && typeof this.typeahead !== 'function') {
-      this.typeaheadAsync = false;
-    }
-
-    // async should be true for any case of function
-    if (typeof this.typeahead === 'function') {
-      this.typeaheadAsync = true;
-    }
-
-    if (this.typeaheadAsync === true) {
-      this.debouncer = this.debounce(() => {
-        if (typeof this.typeahead === 'function') {
-          this.typeahead().then((matches:any[]) => {
-            this._matches = [];
-
-            for (let i = 0; i < matches.length; i++) {
-              this._matches.push(matches[i]);
-              if (this._matches.length > this.typeaheadOptionsLimit - 1) {
-                break;
-              }
-            }
-
-            this.finalizeAsyncCall();
-          });
-        }
-
-        // source is array
-        if (typeof this.typeahead === 'object' && this.typeahead.length) {
-          this.processMatches();
-          this.finalizeAsyncCall();
-        }
-      }, 100);
-    }
-  }
-
-  @HostListener('keydown', ['$event'])
-  onKeydown(e:KeyboardEvent) {
-    // When typeahead container is visible, prevent submitting the form
-    if (this.container && e.keyCode === 13) {
-      e.preventDefault();
-    }
-  }
-
-  @HostListener('keyup', ['$event'])
-  onChange(e:KeyboardEvent) {
-    if (this.container) {
-      // esc
-      if (e.keyCode === 27) {
-        this.hide();
-        return;
-      }
-
-      // up
-      if (e.keyCode === 38) {
-        this.container.prevActiveMatch();
-        return;
-      }
-
-      // down
-      if (e.keyCode === 40) {
-        this.container.nextActiveMatch();
-        return;
-      }
-
-      // enter
-      if (e.keyCode === 13) {
-        this.container.selectActiveMatch();
-        return;
-      }
-    }
-
-    // Ensure that we have typed enough characters before triggering the matchers
-    if (this.cd.model.toString().length >= this.typeaheadMinLength) {
-
-      this.typeaheadLoading.emit(true);
-
-      if (this.typeaheadAsync === true) {
-        this.debouncer();
-      }
-
-      if (this.typeaheadAsync === false) {
-        this.processMatches();
-        this.finalizeAsyncCall();
-      }
-    } else {
-      // Not enough characters typed? Hide the popup.
-      this.hide();
-    }
-  }
-
-  @HostListener('blur', ['$event.target'])
-  onblur() {
-    this.hide();
-  }
-
-  public changeModel(value:any) {
-    let valueStr:string = ((typeof value === 'object' && this.typeaheadOptionField) ? value[this.typeaheadOptionField] : value).toString();
-    this.cd.viewToModelUpdate(valueStr);
-    setProperty(this.renderer, this.element, 'value', valueStr);
-    this.hide();
-  }
-
-  show(matches:Array<any>) {
-    let options = new TypeaheadOptions({
-      placement: this.placement,
-      animation: false
-    });
-
-    let binding = Injector.resolve([
-      new Provider(TypeaheadOptions, {useValue: options})
-    ]);
-
-    this.popup = this.loader
-      .loadNextToLocation(TypeaheadContainer, this.element, binding)
-      .then((componentRef:ComponentRef) => {
-        componentRef.instance.position(this.element);
-        this.container = componentRef.instance;
-        this.container.parent = this;
-        // This improves the speedas it won't have to be done for each list item
-        let normalizedQuery = (this.typeaheadLatinize ? TypeaheadUtils.latinize(this.cd.model) : this.cd.model).toString().toLowerCase();
-        this.container.query = this.typeaheadSingleWords ? TypeaheadUtils.tokenize(normalizedQuery, this.typeaheadWordDelimiters, this.typeaheadPhraseDelimiters) : normalizedQuery;
-        this.container.matches = matches;
-        this.container.field = this.typeaheadOptionField;
-        this.element.nativeElement.focus();
-        return componentRef;
-      });
-  }
-
-  hide() {
-    if (this.container) {
-      this.popup.then((componentRef:ComponentRef) => {
-        componentRef.dispose();
-        this.container = null;
-        return componentRef;
-      });
-    }
-  }
 }
diff --git a/demo/components/accordion/accordion-demo.ts b/demo/components/accordion/accordion-demo.ts
index 6535995eed..d7a6d434a6 100644
--- a/demo/components/accordion/accordion-demo.ts
+++ b/demo/components/accordion/accordion-demo.ts
@@ -31,7 +31,7 @@ export class AccordionDemo {
     }
   ];
 
-  public addItem() {
+  public addItem():void {
     this.items.push(`Items ${this.items.length + 1}`);
   }
 }
diff --git a/demo/components/alert/alert-demo.ts b/demo/components/alert/alert-demo.ts
index 96a6a0dac8..81b5ba1d92 100644
--- a/demo/components/alert/alert-demo.ts
+++ b/demo/components/alert/alert-demo.ts
@@ -11,7 +11,7 @@ let template = require('./alert-demo.html');
   directives: [Alert, CORE_DIRECTIVES]
 })
 export class AlertDemo {
-  alerts:Array<Object> = [
+  public alerts:Array<Object> = [
     {
       type: 'danger',
       msg: 'Oh snap! Change a few things up and try submitting again.'
@@ -23,11 +23,11 @@ export class AlertDemo {
     }
   ];
 
-  closeAlert(i:number) {
+  public closeAlert(i:number):void {
     this.alerts.splice(i, 1);
   }
 
-  addAlert() {
+  public addAlert():void {
     this.alerts.push({msg: 'Another alert!', type: 'warning', closable: true});
   }
 }
diff --git a/demo/components/buttons/buttons-demo.ts b/demo/components/buttons/buttons-demo.ts
index d23d1923f6..abfad66c7e 100644
--- a/demo/components/buttons/buttons-demo.ts
+++ b/demo/components/buttons/buttons-demo.ts
@@ -1,6 +1,5 @@
-import { Component } from 'angular2/core';
-import { CORE_DIRECTIVES, FORM_DIRECTIVES } from 'angular2/common';
-
+import {Component} from 'angular2/core';
+import {CORE_DIRECTIVES, FORM_DIRECTIVES} from 'angular2/common';
 import {BUTTON_DIRECTIVES} from '../../../ng2-bootstrap';
 
 // webpack html imports
@@ -9,10 +8,10 @@ let template = require('./buttons-demo.html');
 @Component({
   selector: 'buttons-demo',
   template: template,
-  directives: [ BUTTON_DIRECTIVES, CORE_DIRECTIVES, FORM_DIRECTIVES ]
+  directives: [BUTTON_DIRECTIVES, CORE_DIRECTIVES, FORM_DIRECTIVES]
 })
 export class ButtonsDemo {
-  private singleModel:string = '1';
-  private radioModel:string = 'Middle';
+  public singleModel:string = '1';
+  public radioModel:string = 'Middle';
   public checkModel:any = {left: false, middle: true, right: false};
 }
diff --git a/demo/components/carousel/carousel-demo.ts b/demo/components/carousel/carousel-demo.ts
index de3089aa7b..0f3f12235a 100644
--- a/demo/components/carousel/carousel-demo.ts
+++ b/demo/components/carousel/carousel-demo.ts
@@ -11,17 +11,17 @@ let template = require('./carousel-demo.html');
   template: template
 })
 export class CarouselDemo {
-  private myInterval:number = 5000;
-  private noWrapSlides:boolean = false;
-  private slides:Array<any> = [];
+  public myInterval:number = 5000;
+  public noWrapSlides:boolean = false;
+  public slides:Array<any> = [];
 
-  constructor() {
+  public constructor() {
     for (let i = 0; i < 4; i++) {
       this.addSlide();
     }
   }
 
-  private addSlide() {
+  public addSlide():void {
     let newWidth = 600 + this.slides.length + 1;
     this.slides.push({
       image: `//placekitten.com/${newWidth}/300`,
@@ -30,7 +30,7 @@ export class CarouselDemo {
     });
   }
 
-  private removeSlide(index:number) {
+  public removeSlide(index:number):void {
     this.slides.splice(index, 1);
   }
 }
diff --git a/demo/components/datepicker/datepicker-demo.ts b/demo/components/datepicker/datepicker-demo.ts
index 048e22a674..dcbeca6960 100644
--- a/demo/components/datepicker/datepicker-demo.ts
+++ b/demo/components/datepicker/datepicker-demo.ts
@@ -14,19 +14,19 @@ let template = require('./datepicker-demo.html');
 })
 export class DatepickerDemo {
   public dt:Date = new Date();
-  private minDate:Date = null;
-  private events:Array<any>;
-  private tomorrow:Date;
-  private afterTomorrow:Date;
-  private formats:Array<string> = ['DD-MM-YYYY', 'YYYY/MM/DD', 'DD.MM.YYYY', 'shortDate'];
-  private format = this.formats[0];
-  private dateOptions:any = {
+  public minDate:Date = void 0;
+  public events:Array<any>;
+  public tomorrow:Date;
+  public afterTomorrow:Date;
+  public formats:Array<string> = ['DD-MM-YYYY', 'YYYY/MM/DD', 'DD.MM.YYYY', 'shortDate'];
+  public format:string = this.formats[0];
+  public dateOptions:any = {
     formatYear: 'YY',
     startingDay: 1
   };
   private opened:boolean = false;
 
-  constructor() {
+  public constructor() {
     (this.tomorrow = new Date()).setDate(this.tomorrow.getDate() + 1);
     (this.afterTomorrow = new Date()).setDate(this.tomorrow.getDate() + 2);
     (this.minDate = new Date()).setDate(this.minDate.getDate() - 1000);
@@ -38,16 +38,16 @@ export class DatepickerDemo {
   public getDate():number {
     return this.dt && this.dt.getTime() || new Date().getTime();
   }
-  private today() {
+  public today():void {
     this.dt = new Date();
   }
 
-  private d20090824() {
+  public d20090824():void {
     this.dt = moment('2009-08-24', 'YYYY-MM-DD').toDate();
   }
 
   // todo: implement custom class cases
-  private getDayClass(date:any, mode:string) {
+  public getDayClass(date:any, mode:string):string {
     if (mode === 'day') {
       let dayToCheck = new Date(date).setHours(0, 0, 0, 0);
 
@@ -63,19 +63,19 @@ export class DatepickerDemo {
     return '';
   }
 
-  private disabled(date:Date, mode:string):boolean {
+  public disabled(date:Date, mode:string):boolean {
     return ( mode === 'day' && ( date.getDay() === 0 || date.getDay() === 6 ) );
   }
 
-  private open() {
+  public open():void {
     this.opened = !this.opened;
   }
 
-  private clear() {
-    this.dt = null;
+  public clear():void {
+    this.dt = void 0;
   }
 
-  private toggleMin() {
+  public toggleMin():void {
     this.dt = new Date(this.minDate.valueOf());
   }
 }
diff --git a/demo/components/demo-header.ts b/demo/components/demo-header.ts
index 66a1f5c14f..e7577d30d2 100644
--- a/demo/components/demo-header.ts
+++ b/demo/components/demo-header.ts
@@ -1,10 +1,7 @@
 import {Component} from 'angular2/core';
 import {CORE_DIRECTIVES} from 'angular2/common';
 import {
-  Collapse,
-  DROPDOWN_DIRECTIVES,
-  Ng2BootstrapConfig,
-  Ng2BootstrapTheme
+  Collapse, DROPDOWN_DIRECTIVES, Ng2BootstrapConfig, Ng2BootstrapTheme
 } from '../../ng2-bootstrap';
 
 let components = [
@@ -62,7 +59,9 @@ export class DemoHeader {
   public isCollapsed:boolean = true;
   public prefix:string;
 
-  constructor() {
-    this.prefix = Ng2BootstrapConfig.theme === Ng2BootstrapTheme.BS4 ? 'index-bs4.html' : '';
+  public constructor() {
+    this.prefix = Ng2BootstrapConfig.theme === Ng2BootstrapTheme.BS4
+      ? 'index-bs4.html'
+      : '';
   }
 }
diff --git a/demo/components/demo-section.ts b/demo/components/demo-section.ts
index b182a3cc69..e25100ba4c 100644
--- a/demo/components/demo-section.ts
+++ b/demo/components/demo-section.ts
@@ -1,8 +1,5 @@
-import {
-  Component, View, OnInit
-} from 'angular2/core';
-import { CORE_DIRECTIVES } from 'angular2/common';
-
+import {Component} from 'angular2/core';
+import {CORE_DIRECTIVES} from 'angular2/common';
 import {TAB_DIRECTIVES} from '../../ng2-bootstrap';
 
 let name = 'Alerts';
@@ -17,18 +14,16 @@ let html = require('!!prismjs?lang=markup!./alert/alert-demo.html');
 let annotations = require('!!prismjs?lang=typescript!../../components/alert/annotation.md');
 
 export class DemoSectionConfig {
-  public doc: string;
-  public title: string;
-  public ts: string;
-  public html: string;
-  public annotations: string;
+  public doc:string;
+  public title:string;
+  public ts:string;
+  public html:string;
+  public annotations:string;
 }
 
 @Component({
   selector: 'demo-section',
-  properties: ['demoSection']
-})
-@View({
+  properties: ['demoSection'],
   template: `
   <br>
   <section id="${name.toLowerCase()}">
@@ -77,5 +72,5 @@ export class DemoSectionConfig {
   directives: [TAB_DIRECTIVES, CORE_DIRECTIVES]
 })
 export class DemoSection {
-  private demoSection: DemoSectionConfig;
+  public demoSection:DemoSectionConfig;
 }
diff --git a/demo/components/dropdown/dropdown-demo.ts b/demo/components/dropdown/dropdown-demo.ts
index 3406a6ad6f..1e25a984ae 100644
--- a/demo/components/dropdown/dropdown-demo.ts
+++ b/demo/components/dropdown/dropdown-demo.ts
@@ -1,6 +1,5 @@
 import {Component} from 'angular2/core';
 import {CORE_DIRECTIVES} from 'angular2/common';
-
 import {DROPDOWN_DIRECTIVES} from '../../../ng2-bootstrap';
 
 // webpack html imports
@@ -12,15 +11,16 @@ let template = require('./dropdown-demo.html');
   template: template
 })
 export class DropdownDemo {
-  private disabled:boolean = false;
-  private status:{isopen:boolean} = {isopen: false};
-  private items:Array<string> = ['The first choice!', 'And another choice for you.', 'but wait! A third!'];
+  public disabled:boolean = false;
+  public status:{isopen:boolean} = {isopen: false};
+  public items:Array<string> = ['The first choice!',
+    'And another choice for you.', 'but wait! A third!'];
 
-  private toggled(open:boolean):void {
+  public toggled(open:boolean):void {
     console.log('Dropdown is now: ', open);
   }
 
-  private toggleDropdown($event:MouseEvent):void {
+  public toggleDropdown($event:MouseEvent):void {
     $event.preventDefault();
     $event.stopPropagation();
     this.status.isopen = !this.status.isopen;
diff --git a/demo/components/pagination/pagination-demo.ts b/demo/components/pagination/pagination-demo.ts
index 23dab4ab5c..851d15f9c2 100644
--- a/demo/components/pagination/pagination-demo.ts
+++ b/demo/components/pagination/pagination-demo.ts
@@ -11,18 +11,18 @@ let template = require('./pagination-demo.html');
   template: template
 })
 export class PaginationDemo {
-  private totalItems:number = 64;
-  private currentPage:number = 4;
+  public totalItems:number = 64;
+  public currentPage:number = 4;
 
-  private maxSize:number = 5;
-  private bigTotalItems:number = 175;
-  private bigCurrentPage:number = 1;
+  public maxSize:number = 5;
+  public bigTotalItems:number = 175;
+  public bigCurrentPage:number = 1;
 
-  private setPage(pageNo:number):void {
+  public setPage(pageNo:number):void {
     this.currentPage = pageNo;
   };
 
-  private pageChanged(event:any):void {
+  public pageChanged(event:any):void {
     console.log('Page changed to: ' + event.page);
     console.log('Number items per page: ' + event.itemsPerPage);
   };
diff --git a/demo/components/progressbar/progressbar-demo.ts b/demo/components/progressbar/progressbar-demo.ts
index ccfaf29a6c..c78c688d53 100644
--- a/demo/components/progressbar/progressbar-demo.ts
+++ b/demo/components/progressbar/progressbar-demo.ts
@@ -1,10 +1,10 @@
 import {Component} from 'angular2/core';
-import { CORE_DIRECTIVES } from 'angular2/common';
+import {CORE_DIRECTIVES} from 'angular2/common';
+import {
+  Ng2BootstrapConfig, Ng2BootstrapTheme, PROGRESSBAR_DIRECTIVES
+} from '../../../ng2-bootstrap';
 
 // switch bs3\bs4 templates
-import {Ng2BootstrapConfig, Ng2BootstrapTheme} from '../../../ng2-bootstrap';
-
-import {PROGRESSBAR_DIRECTIVES} from '../../../ng2-bootstrap';
 
 // webpack html imports
 let templates:any = {
@@ -24,12 +24,12 @@ export class ProgressbarDemo {
   public type:string;
   public stacked:any[] = [];
 
-  constructor() {
+  public constructor() {
     this.random();
     this.randomStacked();
   }
 
-  private random() {
+  public random():void {
     let value = Math.floor((Math.random() * 100) + 1);
     let type:string;
 
@@ -48,7 +48,7 @@ export class ProgressbarDemo {
     this.type = type;
   };
 
-  private randomStacked() {
+  public randomStacked():void {
     let types = ['success', 'info', 'warning', 'danger'];
 
     this.stacked = [];
diff --git a/demo/components/rating/rating-demo.ts b/demo/components/rating/rating-demo.ts
index 20664cd1c6..577496fbaf 100644
--- a/demo/components/rating/rating-demo.ts
+++ b/demo/components/rating/rating-demo.ts
@@ -11,16 +11,16 @@ let template = require('./rating-demo.html');
   template: template
 })
 export class RatingDemo {
-  private x:number = 5;
-  private y:number = 2;
-  private max:number = 10;
-  private rate:number = 7;
-  private isReadonly:boolean = false;
+  public x:number = 5;
+  public y:number = 2;
+  public max:number = 10;
+  public rate:number = 7;
+  public isReadonly:boolean = false;
 
-  private overStar:number;
-  private percent:number;
+  public overStar:number;
+  public percent:number;
 
-  private ratingStates:any = [
+  public ratingStates:any = [
     {stateOn: 'glyphicon-ok-sign', stateOff: 'glyphicon-ok-circle'},
     {stateOn: 'glyphicon-star', stateOff: 'glyphicon-star-empty'},
     {stateOn: 'glyphicon-heart', stateOff: 'glyphicon-ban-circle'},
@@ -28,12 +28,12 @@ export class RatingDemo {
     {stateOff: 'glyphicon-off'}
   ];
 
-  private hoveringOver(value:number):void {
+  public hoveringOver(value:number):void {
     this.overStar = value;
     this.percent = 100 * (value / this.max);
   };
 
-  private resetStar() {
-    this.overStar = null;
+  public resetStar():void {
+    this.overStar = void 0;
   }
 }
diff --git a/demo/components/tabs/tabs-demo.html b/demo/components/tabs/tabs-demo.html
index b726e78f46..ce65821c81 100644
--- a/demo/components/tabs/tabs-demo.html
+++ b/demo/components/tabs/tabs-demo.html
@@ -21,7 +21,7 @@
       {{tabz?.content}}
     </tab>
     <tab (select)="alertMe()">
-      <template tab-heading>
+      <template tabHeading>
         <i class="glyphicon glyphicon-bell"></i> Alert!
       </template>
       I've got an HTML heading, and a select callback. Pretty cool!
diff --git a/demo/components/tabs/tabs-demo.ts b/demo/components/tabs/tabs-demo.ts
index ce1730e43d..db682c1b16 100644
--- a/demo/components/tabs/tabs-demo.ts
+++ b/demo/components/tabs/tabs-demo.ts
@@ -18,17 +18,17 @@ export class TabsDemo {
     {title: 'Dynamic Title 3', content: 'Dynamic content 3', removable: true}
   ];
 
-  public alertMe() {
-    setTimeout(function () {
+  public alertMe():void {
+    setTimeout(function ():void {
       alert('You\'ve selected the alert tab!');
     });
   };
 
-  public setActiveTab(index:number) {
+  public setActiveTab(index:number):void {
     this.tabs[index].active = true;
   };
 
-  public removeTabHandler(tab:any) {
+  public removeTabHandler(/*tab:any*/):void {
     console.log('Remove Tab handler');
   };
 }
diff --git a/demo/components/timepicker/timepicker-demo.ts b/demo/components/timepicker/timepicker-demo.ts
index 2046cc5911..c587f289d0 100644
--- a/demo/components/timepicker/timepicker-demo.ts
+++ b/demo/components/timepicker/timepicker-demo.ts
@@ -11,32 +11,32 @@ let template = require('./timepicker-demo.html');
   template: template
 })
 export class TimepickerDemo {
-  private hstep:number = 1;
-  private mstep:number = 15;
-  private ismeridian:boolean = true;
+  public hstep:number = 1;
+  public mstep:number = 15;
+  public ismeridian:boolean = true;
 
-  private mytime:Date = new Date();
-  private options:any = {
+  public mytime:Date = new Date();
+  public options:any = {
     hstep: [1, 2, 3],
     mstep: [1, 5, 10, 15, 25, 30]
   };
 
-  private toggleMode():void {
+  public toggleMode():void {
     this.ismeridian = !this.ismeridian;
   };
 
-  private update():void {
+  public update():void {
     let d = new Date();
     d.setHours(14);
     d.setMinutes(0);
     this.mytime = d;
   };
 
-  private changed():void {
+  public changed():void {
     console.log('Time changed to: ' + this.mytime);
   };
 
-  private clear():void {
-    this.mytime = null;
+  public clear():void {
+    this.mytime = void 0;
   };
 }
diff --git a/demo/components/typeahead/typeahead-demo.ts b/demo/components/typeahead/typeahead-demo.ts
index af2fe9d04a..11ff99a739 100644
--- a/demo/components/typeahead/typeahead-demo.ts
+++ b/demo/components/typeahead/typeahead-demo.ts
@@ -1,6 +1,5 @@
 import {Component} from 'angular2/core';
 import {CORE_DIRECTIVES, FORM_DIRECTIVES} from 'angular2/common';
-
 import {TYPEAHEAD_DIRECTIVES} from '../../../ng2-bootstrap';
 
 // webpack html imports
@@ -12,18 +11,24 @@ let template = require('./typeahead-demo.html');
   template: template
 })
 export class TypeaheadDemo {
-  private selected:string = '';
-  private asyncSelected:string = '';
-  private typeaheadLoading:boolean = false;
-  private typeaheadNoResults:boolean = false;
-  private states:Array<string> = ['Alabama', 'Alaska', 'Arizona', 'Arkansas', 'California', 'Colorado',
-    'Connecticut', 'Delaware', 'Florida', 'Georgia', 'Hawaii', 'Idaho', 'Illinois', 'Indiana', 'Iowa',
-    'Kansas', 'Kentucky', 'Louisiana', 'Maine', 'Maryland', 'Massachusetts', 'Michigan', 'Minnesota',
-    'Mississippi', 'Missouri', 'Montana', 'Nebraska', 'Nevada', 'New Hampshire', 'New Jersey', 'New Mexico',
-    'New York', 'North Dakota', 'North Carolina', 'Ohio', 'Oklahoma', 'Oregon', 'Pennsylvania', 'Rhode Island',
-    'South Carolina', 'South Dakota', 'Tennessee', 'Texas', 'Utah', 'Vermont', 'Virginia', 'Washington',
+  public selected:string = '';
+  public asyncSelected:string = '';
+  public typeaheadLoading:boolean = false;
+  public typeaheadNoResults:boolean = false;
+  public states:Array<string> = ['Alabama', 'Alaska', 'Arizona', 'Arkansas',
+    'California', 'Colorado',
+    'Connecticut', 'Delaware', 'Florida', 'Georgia', 'Hawaii', 'Idaho',
+    'Illinois', 'Indiana', 'Iowa',
+    'Kansas', 'Kentucky', 'Louisiana', 'Maine', 'Maryland', 'Massachusetts',
+    'Michigan', 'Minnesota',
+    'Mississippi', 'Missouri', 'Montana', 'Nebraska', 'Nevada', 'New Hampshire',
+    'New Jersey', 'New Mexico',
+    'New York', 'North Dakota', 'North Carolina', 'Ohio', 'Oklahoma', 'Oregon',
+    'Pennsylvania', 'Rhode Island',
+    'South Carolina', 'South Dakota', 'Tennessee', 'Texas', 'Utah', 'Vermont',
+    'Virginia', 'Washington',
     'West Virginia', 'Wisconsin', 'Wyoming'];
-  private statesComplex:Array<any> = [
+  public statesComplex:Array<any> = [
     {id: 1, name: 'Alabama'}, {id: 2, name: 'Alaska'}, {id: 3, name: 'Arizona'},
     {id: 4, name: 'Arkansas'}, {id: 5, name: 'California'},
     {id: 6, name: 'Colorado'}, {id: 7, name: 'Connecticut'},
@@ -50,14 +55,14 @@ export class TypeaheadDemo {
     {id: 49, name: 'West Virginia'}, {id: 50, name: 'Wisconsin'},
     {id: 51, name: 'Wyoming'}];
 
-  private getContext() {
-    return this;
-  }
-
   private _cache:any;
   private _prevContext:any;
 
-  private getAsyncData(context:any):Function {
+  public getContext():any {
+    return this;
+  }
+
+  public getAsyncData(context:any):Function {
     if (this._prevContext === context) {
       return this._cache;
     }
@@ -78,15 +83,15 @@ export class TypeaheadDemo {
     return this._cache;
   }
 
-  private changeTypeaheadLoading(e:boolean) {
+  public changeTypeaheadLoading(e:boolean):void {
     this.typeaheadLoading = e;
   }
 
-  private changeTypeaheadNoResults(e:boolean) {
+  public changeTypeaheadNoResults(e:boolean):void {
     this.typeaheadNoResults = e;
   }
 
-  private typeaheadOnSelect(e:any) {
+  public typeaheadOnSelect(e:any):void {
     console.log(`Selected value: ${e.item}`);
   }
 }
diff --git a/demo/index.ts b/demo/index.ts
index 04ac23a492..63994fd1d4 100644
--- a/demo/index.ts
+++ b/demo/index.ts
@@ -1,21 +1,7 @@
-/// <reference path="../typings/browser.d.ts" />
-import {
-  Component, enableProdMode,
-} from 'angular2/core';
+import {Component, 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;
-}
-
-
 import {AccordionSection} from './components/accordion-section';
 import {AlertSection} from './components/alert-section';
 import {ButtonsSection} from './components/buttons-section';
@@ -30,9 +16,18 @@ import {TabsSection} from './components/tabs-section';
 import {TimepickerSection} from './components/timepicker-section';
 import {TooltipSection} from './components/tooltip-section';
 import {TypeaheadSection} from './components/typeahead-section';
-
 import {DemoHeader} from './components/demo-header';
 
+// todo: enable prod mod only for prod build
+// if (false) {
+enableProdMode();
+// }
+
+let w:any = window;
+if (w && w.__theme === 'bs4') {
+  Ng2BootstrapConfig.theme = Ng2BootstrapTheme.BS4;
+}
+
 let gettingStarted = require('./getting-started.md');
 
 @Component({
@@ -108,7 +103,7 @@ let gettingStarted = require('./getting-started.md');
   ]
 })
 export class Demo {
-  private isBs3:boolean = Ng2BootstrapConfig.theme === Ng2BootstrapTheme.BS3;
+  public isBs3:boolean = Ng2BootstrapConfig.theme === Ng2BootstrapTheme.BS3;
 }
 
 bootstrap(Demo);
diff --git a/gulp-tasks/lint.js b/gulp-tasks/lint.js
index 8b8184d673..8d7e794be8 100644
--- a/gulp-tasks/lint.js
+++ b/gulp-tasks/lint.js
@@ -3,14 +3,16 @@
 const gulp = require('gulp');
 const tslint = require('gulp-tslint');
 const paths = gulp.paths;
+const tslintConf = require('../tslint.json');
 
 gulp.task('tslint', () =>
   gulp
     .src(paths.tssrc)
-    .pipe(tslint())
-    .pipe(tslint.report('verbose', {
+    .pipe(tslint(tslintConf))
+    .pipe(tslint.report('prose', {
       emitError: true,
-      reportLimit: 0
+      summarizeFailureOutput: true,
+      reportLimit: 50
     }))
 );
 
diff --git a/gulpfile.js b/gulpfile.js
index 831d2dd037..86bfd2b736 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -5,10 +5,10 @@ const gulp = require('gulp');
 gulp.paths = {
   tssrc: [
     '**/*.ts',
+    '!**/*.d.ts',
     '!node_modules/**/*',
     '!bundles/**/*',
-    '!typings/**/*',
-    '!**/*.{ts,coffee}.js'],
+    '!typings/**/*'],
   jssrc: [
     '*.js',
     'gulp-tasks/*.js',
diff --git a/ng2-bootstrap.ts b/ng2-bootstrap.ts
index 7ddcd81019..e2840e9bbb 100644
--- a/ng2-bootstrap.ts
+++ b/ng2-bootstrap.ts
@@ -34,6 +34,7 @@ export * from './components/ng2-bootstrap-config';
 
 export default {
   directives: [
+    Alert,
     ACCORDION_DIRECTIVES,
     BUTTON_DIRECTIVES,
     CAROUSEL_DIRECTIVES,
diff --git a/package.json b/package.json
index 340d56c1b1..ffbb86a316 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
     "async": "1.5.2",
     "balanced-match": "0.3.0",
     "bootstrap": "3.3.6",
+    "codelyzer": "0.0.12",
     "compression-webpack-plugin": "0.3.1",
     "conventional-changelog": "1.1.0",
     "conventional-changelog-cli": "1.1.1",
diff --git a/tslint.json b/tslint.json
index 8079a66b13..437f5fb50c 100644
--- a/tslint.json
+++ b/tslint.json
@@ -1,54 +1,90 @@
 {
+  "rulesDirectory": "./node_modules/codelyzer/dist/src",
   "rules": {
+    "align": [true, "parameters", "statements"],
+    "ban": false,
     "class-name": true,
-    "comment-format": [true],
+    "comment-format": [true, "check-space"],
     "curly": true,
     "eofline": true,
     "forin": true,
     "indent": [true, "spaces"],
+    "interface-name": [true, "never-prefix"],
+    "jsdoc-format": true,
     "label-position": true,
     "label-undefined": true,
-    "max-line-length": [false, 140],
+    "max-line-length": true,
+    "member-access": [true, "check-accessor", "check-constructor"],
+    "member-ordering": [
+      true, "public-before-private", "static-before-instance",
+      "variables-before-functions"
+    ],
+    "no-any": false,
     "no-arg": true,
     "no-bitwise": true,
-    "no-console": [true,
-      "debug",
-      "info",
-      "time",
-      "timeEnd",
-      "trace"
-    ],
+    "no-conditional-assignment": true,
+    "no-consecutive-blank-lines": true,
+    "no-console": true,
     "no-construct": true,
+    "no-constructor-vars": true,
     "no-debugger": true,
     "no-duplicate-key": true,
     "no-duplicate-variable": true,
-    "no-empty": false,
     "no-eval": true,
+    "no-inferrable-types": true,
+    "no-internal-module": true,
+    "no-null-keyword": true,
+    "no-require-imports": false,
     "no-shadowed-variable": true,
     "no-string-literal": true,
     "no-switch-case-fall-through": true,
     "no-trailing-whitespace": true,
-    "no-unused-expression": true,
-    "no-unused-variable": false,
     "no-unreachable": true,
+    "no-unused-expression": true,
+    "no-unused-variable": [true, "check-parameters"],
     "no-use-before-declare": true,
-    "no-var-keyword": false,
-    "one-line": [true,
-      "check-open-brace",
-      "check-catch",
-      "check-else",
-      "check-whitespace"
+    "no-var-keyword": true,
+    "no-var-requires": false,
+    "object-literal-sort-keys": false,
+    "one-line": [
+      true, "check-catch", "check-else", "check-open-brace", "check-whitespace"
     ],
     "quotemark": [true, "single"],
     "radix": true,
-    "semicolon": true,
+    "semicolon": [true, "always"],
+    "switch-default": true,
     "triple-equals": [true, "allow-null-check"],
-    "variable-name": false,
-    "whitespace": [true,
-      "check-branch",
-      "check-decl",
-      "check-operator",
-      "check-separator"
-    ]
+    "typedef": [
+      true, "call-signature", "parameter", "arrow-parameter",
+      "property-declaration", "member-variable-declaration"
+    ],
+    "typedef-whitespace": [
+      true, {
+        "call-signature": "nospace",
+        "index-signature": "nospace",
+        "parameter": "nospace",
+        "property-declaration": "nospace",
+        "variable-declaration": "nospace"
+      }
+    ],
+    "use-strict": [true, "check-module"],
+    "variable-name": [true, "ban-keywords"],
+    "whitespace": [
+      false, "check-branch", "check-decl", "check-operator", "check-module",
+      "check-separator", "check-type", "check-typecast"
+    ],
+    "directive-selector-name": [true, "camelCase"],
+    "component-selector-name": [true, "kebab-case"],
+    "directive-selector-type": [true, "attribute"],
+    "component-selector-type": [true, "element"],
+    "directive-selector-prefix": [false],
+    "component-selector-prefix": [false],
+    "host-parameter-decorator": true,
+    "input-parameter-decorator": true,
+    "output-parameter-decorator": true,
+    "attribute-parameter-decorator": true,
+    "input-property-directive": true,
+    "output-property-directive": true,
+    "call-forward-ref": true
   }
 }