diff --git a/roles/nfs-server/tasks/mkFilesystem.yml b/roles/make_filesystems/main.yml
similarity index 100%
rename from roles/nfs-server/tasks/mkFilesystem.yml
rename to roles/make_filesystems/main.yml
diff --git a/roles/nfs-server/tasks/main.yml b/roles/nfs-server/tasks/main.yml
index 9ba0c9fbddc184fa9717e77505148a81efc03e8c..bde7943086ed49798b340a43dcbad5808836e1d9 100644
--- a/roles/nfs-server/tasks/main.yml
+++ b/roles/nfs-server/tasks/main.yml
@@ -4,5 +4,4 @@
   sudo: true
   when: ansible_os_family == "Debian"
 
-- include: mkFilesystem.yml 
 - include: startServer.yml
diff --git a/roles/nfs-server/tasks/startServer.yml b/roles/nfs-server/tasks/startServer.yml
index 606b143bda4081e031d4944f63125f0d8036fae2..c2f74a2f2d5d8245785117a5c54c6d0b20d13e8e 100644
--- a/roles/nfs-server/tasks/startServer.yml
+++ b/roles/nfs-server/tasks/startServer.yml
@@ -1,15 +1,15 @@
 --- 
 - name: "Starting rpcbind"
-  service: "name=rpcbind state=restarted"
+  service: "name=rpcbind state=started"
   sudo: true
   when: ansible_os_family == "RedHat"
 
 - name: "Start the Server"
-  service: "name=nfs state=restarted"
+  service: "name=nfs state=started"
   sudo: true
   when: ansible_os_family == "RedHat"
 
 - name: "Start the Server"
-  service: "name=nfs-kernel-server state=restarted"
+  service: "name=nfs-kernel-server state=started"
   sudo: true
   when: ansible_os_family == "Debian"
diff --git a/roles/syncExports/tasks/addExports.yml b/roles/syncExports/tasks/addExports.yml
index b59b905288ac85341e1e14ef5b104fefa58dedec..6edbd85aa12381f8606ecfa7fdda754012dac4c8 100644
--- a/roles/syncExports/tasks/addExports.yml
+++ b/roles/syncExports/tasks/addExports.yml
@@ -1,24 +1,21 @@
 ---
-- name: "Create exports if necessary"
-  file: dest={{ item.src }} state=directory mode=755 owner=root group=root
-  sudo: true
-  with_items: exportList
-
 - name: "Templating /etc/exports"
   copy: src=files/etcExports dest=/etc/exports owner=root group=root mode=644
   sudo: true
+  register: exports
 
 - name: "Start the Server"
   service: "name=nfs state=restarted"
   sudo: true
-  when: ansible_os_family == "RedHat"
+  when: ansible_os_family == "RedHat" and exports.changed
 
 - name: "Start the Server"
   service: "name=nfs-kernel-server state=restarted"
   sudo: true
-  when: ansible_os_family == "Debian"
+  when: ansible_os_family == "Debian" and exports.changed
 
 - name : "Pause ... clients sometimes have errors"
   command: sleep 60
   notify: "Reload exports"
+  when: exports.changed