     progress = timestamp - @startTime
       
     # to ease or not to ease is the question
-    if @useEasing
+    if @options.Easing
       if @countDown
-        i = @easeOutExpo progress, 0, @startVal - endVal, @duration
+        i = @easeOutExpo progress, 0, @startVal - @endVal, @duration
         @frameVal = @startVal - i
       else
-        @frameVal = @easeOutExpo(progress, @startVal, endVal - @startVal, @duration)
+        @frameVal = @easeOutExpo(progress, @startVal, @endVal - @startVal, @duration)
     else
       if @countDown
-        i = (startVal - endVal) * (progress / @duration)
+        i = (@startVal - @endVal) * (progress / @duration)
         @frameVal = @startVal - i
       else
-        @frameVal = @startVal + (endVal - @startVal) * (progress / @duration)
+        @frameVal = @startVal + (@endVal - @startVal) * (progress / @duration)
         
     # decimal
     @frameVal = Math.round(@frameVal * @dec) / @dec
 
     # don't go past enVal since progress can exceed duration in last grame   
     if @countDown
-      @frameVal = if (@framVal < endVal) then endVal else @frameVal
+      @frameVal = if (@framVal < @endVal) then @endVal else @frameVal
     else
-      @frameVal = if (@framVal > endVal) then endVal else @frameVal
+      @frameVal = if (@framVal > @endVal) then @endVal else @frameVal
 
     # formate and print value
-    @doc.innerHTML = @addCommas @frameVal.toFixed(decimals)
+    @doc.innerHTML = @formatNumber @frameVal.toFixed(decimals)
 
     # weather to continue
     if progress < @duration

  @reset = () ->
    @startTime = null
    cancelAnimationFrame @rAF
    @doc.innerHTML = @addCommas @startVal.toFixed(decimals)

  @resume = () ->
    @startTime = null

    @startVal = @framVal
    requestAnimationFrame @count

  @formatNumber = (nStr) ->
    nStr += ''
    x = nStr.split('.')
    x1 = x[0]
    x2 = if x.length > 1 then @options.decimal + x[1] else ''
    rgx = /(\d+)(\d{3})/

    if @options.useGrouping
      while rgx.test(x1)
        x1 = x1.replace(rgx, '$1' + @options.separator + '$2')

    x1 + x2

  # format @startVal on initialization
  @doc.innerHTML = @formatNumber @startVal.toFixed(decimals)
