diff --git a/security/tor/Makefile b/security/tor/Makefile
index b6d00b634..28d460a1a 100644
--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=          tor
-PLUGIN_VERSION=       0.1
+PLUGIN_VERSION=       0.2
 PLUGIN_COMMENT=       The Onion Router
 PLUGIN_DEPENDS=       tor
 PLUGIN_MAINTAINER=    franz.fabian.94@gmail.com
diff --git a/security/tor/pkg-descr b/security/tor/pkg-descr
new file mode 100644
index 000000000..579bc518f
--- /dev/null
+++ b/security/tor/pkg-descr
@@ -0,0 +1,9 @@
+Tor is a connection-based low-latency anonymous communication system which
+addresses many flaws in the original onion routing design.
+
+Tor is a toolset for a wide range of organizations and people that
+want to improve their safety and security on the Internet. Using
+Tor can help you anonymize web browsing and publishing, instant
+messaging, IRC, SSH, and more. Tor also provides a platform on which
+software developers can build new applications with built-in
+anonymity, safety, and privacy features.
diff --git a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ServiceController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ServiceController.php
index 8be3d5db0..0846d2059 100644
--- a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ServiceController.php
+++ b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ServiceController.php
@@ -148,7 +148,7 @@ class ServiceController extends ApiControllerBase
             $backend->configdRun('template reload OPNsense/Tor');
 
             // (re)start daemon
-            if ($general->enabled->__toString() == 1) {
+            if ($general->enabled->__toString() == '1') {
                 $this->startAction();
             }
 
diff --git a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/IndexController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/IndexController.php
index b2e0739a0..c5a04e4cf 100644
--- a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/IndexController.php
+++ b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/IndexController.php
@@ -48,4 +48,10 @@ class IndexController extends \OPNsense\Base\IndexController
         $this->view->exitpolicy = $this->getForm("acl_exitpolicy");
         $this->view->pick('OPNsense/Tor/general');
     }
+
+    public function infoAction()
+    {
+        $this->view->title = gettext("The Onion Router - Information");
+        $this->view->pick('OPNsense/Tor/info');
+    }
 }
diff --git a/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Menu/Menu.xml b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Menu/Menu.xml
index 9dd1e7b47..a39ace8ad 100644
--- a/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Menu/Menu.xml
+++ b/security/tor/src/opnsense/mvc/app/models/OPNsense/Tor/Menu/Menu.xml
@@ -2,6 +2,7 @@
   <Services>
     <tor VisibleName="Tor" cssClass="fa fa-bolt fa-fw">
       <configuration VisibleName="Configuration" url="/ui/tor/" />
+      <info VisibleName="Information" url="/ui/tor/index/info" />
     </tor>
   </Services>
 </menu>
diff --git a/security/tor/src/opnsense/mvc/app/views/OPNsense/Tor/general.volt b/security/tor/src/opnsense/mvc/app/views/OPNsense/Tor/general.volt
index ab1db2e0a..db6512e42 100644
--- a/security/tor/src/opnsense/mvc/app/views/OPNsense/Tor/general.volt
+++ b/security/tor/src/opnsense/mvc/app/views/OPNsense/Tor/general.volt
@@ -30,6 +30,20 @@
 
 <script type="text/javascript">
 
+function tor_update_status() {
+    ajaxCall(url="/api/tor/service/status", sendData={}, callback=function(data,status) {
+        updateServiceStatusUI(data['status']);
+    });
+}
+
+function reload_handler() {
+    $(".reloadAct_progress").addClass("fa-spin");
+    ajaxCall(url="/api/tor/service/reconfigure", sendData={}, callback=function(data,status) {
+        tor_update_status();
+        $(".reloadAct_progress").removeClass("fa-spin");
+    });
+}
+
 $( document ).ready(function() {
     var data_get_map = {
         'general': '/api/tor/general/get',
@@ -39,9 +53,6 @@ $( document ).ready(function() {
         formatTokenizersUI();
         $('select.dropdownstyle').selectpicker('refresh');
     });
-    ajaxCall(url="/api/tor/service/status", sendData={}, callback=function(data,status) {
-        updateServiceStatusUI(data['result']);
-    });
 
     // link save button to API set action
     [
@@ -51,15 +62,19 @@ $( document ).ready(function() {
         $(cfg.selector).click(function(){
             saveFormToEndpoint(url=cfg.endpoint, formid=cfg.formid,callback_ok=function(){
                 $(cfg.selector + " .saveAct_progress").addClass("fa fa-spinner fa-pulse");
-                ajaxCall(url="/api/tor/service/restart", sendData={}, callback=function(data,status) {
-                    ajaxCall(url="/api/tor/service/status", sendData={}, callback=function(data,status) {
-                        updateServiceStatusUI(data['result']);
-                    });
+                ajaxCall(url="/api/tor/service/reconfigure", sendData={}, callback=function(data,status) {
+                    tor_update_status();
                     $(cfg.selector + " .saveAct_progress").removeClass("fa fa-spinner fa-pulse");
                 });
             });
         });
     });
+
+    tor_update_status();
+
+    /* allow a user to manually reload the service (for forms which do not do it automatically) */
+    $('.reload_btn').click(reload_handler);
+
     $("#grid-hidden").UIBootgrid(
         { 'search':'/api/tor/hiddenservice/searchservice',
           'get':'/api/tor/hiddenservice/getservice/',
@@ -140,6 +155,7 @@ $( document ).ready(function() {
                   <td>
                       <button data-action="add" type="button" class="btn btn-xs btn-default"><span class="fa fa-plus"></span></button>
                       <!-- <button data-action="deleteSelected" type="button" class="btn btn-xs btn-default"><span class="fa fa-trash-o"></span></button> -->
+                      <button type="button" class="btn btn-xs reload_btn btn-primary"><span class="fa fa-refresh reloadAct_progress"></span> {{ lang._('Reload Service') }}</button>
                   </td>
               </tr>
           </tfoot>
@@ -163,6 +179,7 @@ $( document ).ready(function() {
                   <td>
                       <button data-action="add" type="button" class="btn btn-xs btn-default"><span class="fa fa-plus"></span></button>
                       <!-- <button data-action="deleteSelected" type="button" class="btn btn-xs btn-default"><span class="fa fa-trash-o"></span></button> -->
+                      <button type="button" class="btn btn-xs reload_btn btn-primary"><span class="fa fa-refresh reloadAct_progress"></span> {{ lang._('Reload Service') }}</button>
                   </td>
               </tr>
           </tfoot>
@@ -189,6 +206,7 @@ $( document ).ready(function() {
                     <td>
                         <button data-action="add" type="button" class="btn btn-xs btn-default"><span class="fa fa-plus"></span></button>
                         <!-- <button data-action="deleteSelected" type="button" class="btn btn-xs btn-default"><span class="fa fa-trash-o"></span></button> -->
+                        <button type="button" class="btn btn-xs reload_btn btn-primary"><span class="fa fa-refresh reloadAct_progress"></span> {{ lang._('Reload Service') }}</button>
                     </td>
                 </tr>
             </tfoot>
@@ -227,6 +245,7 @@ $( document ).ready(function() {
                   <td>
                       <button data-action="add" type="button" class="btn btn-xs btn-default"><span class="fa fa-plus"></span></button>
                       <!-- <button data-action="deleteSelected" type="button" class="btn btn-xs btn-default"><span class="fa fa-trash-o"></span></button> -->
+                      <button type="button" class="btn btn-xs reload_btn btn-primary"><span class="fa fa-refresh reloadAct_progress"></span> {{ lang._('Reload Service') }}</button>
                   </td>
               </tr>
           </tfoot>
diff --git a/security/tor/src/opnsense/mvc/app/views/OPNsense/Tor/info.volt b/security/tor/src/opnsense/mvc/app/views/OPNsense/Tor/info.volt
new file mode 100644
index 000000000..1029e376f
--- /dev/null
+++ b/security/tor/src/opnsense/mvc/app/views/OPNsense/Tor/info.volt
@@ -0,0 +1,74 @@
+{#
+
+    Copyright (C) 2017 Fabian Franz
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+
+
+#}
+
+
+<script type="text/javascript">
+
+function tor_update_status() {
+    ajaxCall(url="/api/tor/service/status", sendData={}, callback=function(data, status) {
+        updateServiceStatusUI(data['status']);
+    });
+}
+
+$( document ).ready(function() {
+
+    tor_update_status();
+    ajaxCall(url="/api/tor/service/get_hidden_services", sendData={}, callback=function(data, status) {
+        data = data['response'];
+        var tmp = '';
+        for (var name in data) {
+            if (data.hasOwnProperty(name)) {
+                tmp += '<tr><td>' + name + '</td><td>' + data[name] + '</td></tr>';
+            }
+        }
+
+        $("#hiddenservicetbdy").html(tmp);
+
+    });
+
+});
+
+</script>
+<ul class="nav nav-tabs" data-tabs="tabs" id="maintabs">
+    <li class="active"><a data-toggle="tab" href="#hiddennames">{{ lang._('Hidden Service Names') }}</a></li>
+</ul>
+
+<div class="tab-content content-box tab-content" style="padding-bottom: 1.5em;">
+    <div id="hiddennames" class="tab-pane fade in active">
+        <table style="margin: 10px;">
+            <thead>
+                <tr>
+                    <th>{{ lang._('Hidden Service Name') }}</th>
+                    <th>{{ lang._('Hostname') }}</th>
+                </tr>
+            </thead>
+            <tbody id="hiddenservicetbdy"></tbody>
+        </table>
+    </div>
+</div>
diff --git a/security/tor/src/opnsense/service/scripts/tor/setup.sh b/security/tor/src/opnsense/service/scripts/tor/setup.sh
index c7680cb15..1af7a235b 100755
--- a/security/tor/src/opnsense/service/scripts/tor/setup.sh
+++ b/security/tor/src/opnsense/service/scripts/tor/setup.sh
@@ -3,5 +3,8 @@ mkdir -p /var/db/tor
 mkdir -p /var/log/tor
 mkdir -p /var/run/tor
 
+chown _tor:_tor /var/db/tor
+chmod 700 /var/db/tor
+
 # required to access the pf device for nat
 /usr/sbin/pw groupmod proxy -m _tor