diff --git a/gradle/daemon/syncanyd b/gradle/daemon/syncanyd
index f5f27fb66..c69c2fd61 100755
--- a/gradle/daemon/syncanyd
+++ b/gradle/daemon/syncanyd
@@ -42,13 +42,13 @@ mkdir -p $LOGDIR
 start() {
 	RUNNING=$(process_running)
 	
-	echo "Starting daemon: "
+	echo -n "Starting daemon: "
 	
 	if [ $RUNNING -eq 1 ]; then
 		echo "$NAME already running (pid $PID)"
 	else
-		nohup $DAEMON $DAEMON_OPTS > /dev/null 2>&1 &
-		
+		nohup "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.syncany.Syncany $DAEMON_OPTS > /dev/null 2>&1 &
+
 		PID=-1
 		TRIES=10
 		
@@ -74,7 +74,7 @@ start() {
 stop() {
 	RUNNING=$(process_running)
 
-	echo "Stopping daemon: "
+	echo -n "Stopping daemon: "
 	
 	if [ $RUNNING -eq 0 ]; then
 		echo "$NAME not running"
@@ -127,9 +127,10 @@ force_stop() {
 
 
 status() {
+	RUNNING=$(process_running)
 	echo -n "Checking daemon: "$NAME
 	
-	if [ ! -e /proc/$PID ]; then
+	if [ $RUNNING -eq 0 ]; then
 		echo " not running"
 	else
 		echo " running (pid $PID)."
@@ -137,9 +138,10 @@ status() {
 }
 
 reload() {
+	RUNNING=$(process_running)
 	echo -n "Reloading daemon: "$NAME
 	
-	if [ ! -e /proc/$PID ]; then
+	if [ $RUNNING -eq 0 ]; then
 		echo " not running"
 	else
 		echo "reload" >> $CONTROLFILE
diff --git a/gradle/gradle/application.distribution.gradle b/gradle/gradle/application.distribution.gradle
index bfc6d0601..202b99e41 100644
--- a/gradle/gradle/application.distribution.gradle
+++ b/gradle/gradle/application.distribution.gradle
@@ -47,6 +47,7 @@ startScripts {
 		
 		// Update unix text
 		def unixText = unixFile.text
+		def usage = "Usage: sy daemon (start|stop|reload|restart|status|force-stop)"
 		textTmp = ""
 		def daemonScript = new File('gradle/daemon/syncanyd').text
 		
@@ -63,11 +64,16 @@ startScripts {
 					textTmp += '    			stop   ;;     \n'
 					textTmp += '			status)           \n'
 					textTmp += '    			status ;;     \n'
+					textTmp += '			reload)           \n'
+					textTmp += '				reload ;;     \n'
+					textTmp += '			force-stop)       \n'
+					textTmp += '    			force_stop ;; \n'
+					
 					textTmp += '			*)                \n'
-					textTmp += '            	echo "Usage: sy daemon (start|stop|reload|restart|status|force-stop)"\n'
+					textTmp += '          echo "' + usage + '"\n'
 					textTmp += '		esac    ;;            \n'
 					textTmp += '     *)                       \n'
-					textTmp += 				line + '   ;;     \n'
+					textTmp += '        ' +	line + '   ;;     \n'
 					textTmp += 'esac                          \n'
 				}
 				else {
diff --git a/syncany-lib/.gitignore b/syncany-lib/.gitignore
deleted file mode 100644
index ff3e2543b..000000000
--- a/syncany-lib/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/
-/bin/