diff --git a/app/controllers/blocks.js b/app/controllers/blocks.js
index 4eae98e6..a2b6ca7b 100644
--- a/app/controllers/blocks.js
+++ b/app/controllers/blocks.js
@@ -109,6 +109,9 @@ exports.list = function(req, res) {
     else {
       var blockshashList = [];
       var limit = parseInt(req.query.limit || blocks.length);
+      if (blocks.length < limit) {
+        limit = blocks.length;
+      }
       for(var i=0;i<limit;i++) {
         blockshashList.push(blocks[i].hash);
       }
diff --git a/insight.js b/insight.js
index 0b811f7f..99af5b8b 100644
--- a/insight.js
+++ b/insight.js
@@ -74,7 +74,7 @@ if (!config.disableHistoricSync) {
       historicSync.smartImport({}, function(err){
         var txt = 'ended.';
         if (err) txt = 'ABORTED with error: ' + err.message;
-        else 
+        else
           ps.allowReorgs = true;
 
         console.log('[historic_sync] ' + txt, historicSync.info());
diff --git a/lib/TransactionRpc.js b/lib/TransactionRpc.js
index 0eaef276..6e43d04c 100644
--- a/lib/TransactionRpc.js
+++ b/lib/TransactionRpc.js
@@ -7,8 +7,8 @@ function spec(b) {
   var RpcClient       = require('bitcore/RpcClient').class(),
 //      networks         = require('bitcore/network'),
       BitcoreTransaction = require('bitcore/Transaction').class(),
-      BitcoreBlock = require('bitcore/Block').class(),
-      util         = require('bitcore/util/util'),
+//      BitcoreBlock = require('bitcore/Block').class(),
+//      util         = require('bitcore/util/util'),
       config       = require('../config/config');
 
    var  rpc  = b.rpc || new RpcClient(config.bitcoind);
diff --git a/public/js/controllers/header.js b/public/js/controllers/header.js
index 5b4d3a98..71472724 100755
--- a/public/js/controllers/header.js
+++ b/public/js/controllers/header.js
@@ -33,7 +33,7 @@ angular.module('insight.system').controller('HeaderController',
   };
 
   socket.on('block', function(block) {
-    var blockHash = block.hash.hash.toString();
+    var blockHash = block.hash.toString();
     console.log('Updated Blocks Height!');
     _getBlock(blockHash);
   });
diff --git a/public/js/controllers/index.js b/public/js/controllers/index.js
index a16aeb88..76e56e65 100755
--- a/public/js/controllers/index.js
+++ b/public/js/controllers/index.js
@@ -4,7 +4,7 @@ var TRANSACTION_DISPLAYED = 5;
 var BLOCKS_DISPLAYED = 5;
 
 angular.module('insight.system').controller('IndexController',
-  function($scope, $rootScope, Global, getSocket, Blocks, Transactions) {
+  function($scope, $rootScope, Global, getSocket, Blocks, Transaction) {
   $scope.global = Global;
 
   var _getBlocks = function() {
@@ -15,12 +15,12 @@ angular.module('insight.system').controller('IndexController',
       $scope.blocksLength = res.lenght;
     });
   };
-  
-  var _getTransactions = function() {
-    Transactions.get({
-      limit: TRANSACTION_DISPLAYED
+ 
+  var _getTransaction = function(txid, cb) {
+    Transaction.get({
+      txId: txid
     }, function(res) {
-      $scope.txs = res.txs;
+      cb(res);
     });
   };
 
@@ -32,11 +32,18 @@ angular.module('insight.system').controller('IndexController',
 
   socket.on('tx', function(tx) {
     console.log('Transaction received! ' + JSON.stringify(tx));
-    _getTransactions();
+
+    var txStr = tx.toString();
+    _getTransaction(txStr, function(res) {
+      $scope.txs.unshift(res);
+      if (parseInt($scope.txs.length, 10) >= parseInt(TRANSACTION_DISPLAYED, 10)) {
+        $scope.txs = $scope.txs.splice(0, TRANSACTION_DISPLAYED);
+      }
+    });
   });
 
   socket.on('block', function(block) {
-    var blockHash = block.hash.hash.toString();
+    var blockHash = block.hash.toString();
     console.log('Block received! ' + JSON.stringify(blockHash));
     _getBlocks();
   });
@@ -48,7 +55,6 @@ angular.module('insight.system').controller('IndexController',
 
   $scope.index = function() {
     _getBlocks();
-    _getTransactions();
   };
 
   $scope.txs = [];