diff --git a/browser/index.js b/browser/index.js
index fa58c85b3..434692902 100644
--- a/browser/index.js
+++ b/browser/index.js
@@ -226,8 +226,6 @@ function formatWallet(wallet) {
   });
 }
 
-bcoin.workerpool.enable();
-
 node = new bcoin.fullnode({
   hash: true,
   query: true,
@@ -236,14 +234,11 @@ node = new bcoin.fullnode({
   db: 'leveldb',
   coinCache: 30000000,
   logConsole: true,
+  workers: true,
   logger: logger
 });
 
-wdb = node.use(bcoin.walletplugin);
-
-node.on('error', function(err) {
-  ;
-});
+wdb = node.use(bcoin.wallet.plugin);
 
 node.chain.on('block', addItem);
 node.mempool.on('tx', addItem);
diff --git a/browser/server.js b/browser/server.js
index 778642fd6..cbedd7369 100644
--- a/browser/server.js
+++ b/browser/server.js
@@ -3,7 +3,6 @@
 const HTTPBase = require('../lib/http/base');
 const WSProxy = require('./wsproxy');
 const fs = require('fs');
-const server, proxy;
 
 const index = fs.readFileSync(`${__dirname}/index.html`);
 const indexjs = fs.readFileSync(`${__dirname}/index.js`);
@@ -11,18 +10,22 @@ const bcoin = fs.readFileSync(`${__dirname}/bcoin.js`);
 const master = fs.readFileSync(`${__dirname}/bcoin-master.js`);
 const worker = fs.readFileSync(`${__dirname}/bcoin-worker.js`);
 
-proxy = new WSProxy({
+let proxy = new WSProxy({
   pow: process.argv.indexOf('--pow') !== -1,
   ports: [8333, 18333, 18444, 28333, 28901]
 });
 
+let server = new HTTPBase({
+  port: +process.argv[2] || 8080,
+  sockets: false
+});
+
 proxy.on('error', (err) => {
   console.error(err.stack + '');
 });
 
-server = new HTTPBase({
-  port: +process.argv[2] || 8080,
-  sockets: false
+server.on('error', (err) => {
+  console.error(err.stack + '');
 });
 
 server.get('/favicon.ico', (req, res) => {
@@ -49,10 +52,6 @@ server.get('/bcoin-worker.js', (req, res) => {
   res.send(200, worker, 'js');
 });
 
-server.on('error', (err) => {
-  console.error(err.stack + '');
-});
-
 proxy.attach(server.server);
 
 server.open();
diff --git a/etc/sample.conf b/etc/sample.conf
index 7676c523d..6999ef9b5 100644
--- a/etc/sample.conf
+++ b/etc/sample.conf
@@ -5,10 +5,6 @@
 #
 
 # network: main
-use-workers: true
-# max-workers: 4
-# worker-timeout: 5000
-# sigcache-size: 50000
 
 #
 # Node
@@ -19,6 +15,14 @@ db: leveldb
 max-files: 64
 cache-size: 100
 
+#
+# Workers
+#
+
+workers: true
+# workers-size: 4
+# workers-timeout: 5000
+
 #
 # Logger
 #
@@ -33,7 +37,8 @@ log-file: true
 
 prune: false
 checkpoints: true
-coin-cache: 40
+coin-cache: 0
+entry-cache: 5000
 index-tx: false
 index-address: false
 
@@ -83,6 +88,9 @@ identity-key: 74b4147957813b62cc8987f2b711ddb31f8cb46dcbf71502033da66053c8780a
 # Always try to connect to these nodes.
 # nodes: 127.0.0.1,127.0.0.2
 
+# Only try to connect to these nodes.
+# only: 127.0.0.1,127.0.0.2
+
 #
 # Miner
 #
@@ -103,7 +111,13 @@ http-host: ::
 # ssl: true
 # ssl-cert: @/ssl/cert.crt
 # ssl-key: @/ssl/priv.key
-service-key: bikeshed
 api-key: bikeshed
-wallet-auth: false
 # no-auth: false
+
+#
+# Wallet
+#
+
+wallet-witness: false
+wallet-checkpoints: true
+wallet-auth: false
diff --git a/lib/bcoin-browser.js b/lib/bcoin-browser.js
index 00e9e78a0..17374c9b9 100644
--- a/lib/bcoin-browser.js
+++ b/lib/bcoin-browser.js
@@ -263,7 +263,6 @@ bcoin.wallet = require('./wallet');
 bcoin.path = require('./wallet/path');
 bcoin.walletkey = require('./wallet/walletkey');
 bcoin.walletdb = require('./wallet/walletdb');
-bcoin.walletplugin = require('./wallet/plugin');
 
 // Workers
 bcoin.workers = require('./workers');
diff --git a/lib/bcoin.js b/lib/bcoin.js
index 3425d32a1..b6b37b2de 100644
--- a/lib/bcoin.js
+++ b/lib/bcoin.js
@@ -296,7 +296,6 @@ bcoin.define('wallet', './wallet');
 bcoin.define('path', './wallet/path');
 bcoin.define('walletkey', './wallet/walletkey');
 bcoin.define('walletdb', './wallet/walletdb');
-bcoin.define('walletplugin', './wallet/plugin');
 
 // Workers
 bcoin.define('workers', './workers');
diff --git a/lib/node/node.js b/lib/node/node.js
index 932a91037..a12bd6b61 100644
--- a/lib/node/node.js
+++ b/lib/node/node.js
@@ -86,7 +86,7 @@ Node.prototype.initOptions = function initOptions() {
   this.logger = logger.context('node');
 
   this.workers = new WorkerPool({
-    enabled: config.str('workers-enabled'),
+    enabled: config.bool('workers'),
     size: config.num('workers-size'),
     timeout: config.num('workers-timeout')
   });
diff --git a/webpack.browser.js b/webpack.browser.js
index 5bd8a6f95..2fef01938 100644
--- a/webpack.browser.js
+++ b/webpack.browser.js
@@ -22,7 +22,7 @@ module.exports = {
   module: {
     rules: [{
       test: /\.js$/,
-      exclude: /node_modules\/(bn.js|elliptic|n64)/,
+      exclude: /node_modules\/(?!bcoin|elliptic|bn\.js|n64)/,
       loader: 'babel-loader'
     }]
   },