diff --git a/fs/etc/group b/fs/etc/group
new file mode 100644
index 0000000..8f2e8a1
--- /dev/null
+++ b/fs/etc/group
@@ -0,0 +1,56 @@
+root:x:0:
+daemon:x:1:
+bin:x:2:
+sys:x:3:
+adm:x:4:pi
+tty:x:5:
+disk:x:6:
+lp:x:7:
+mail:x:8:
+news:x:9:
+uucp:x:10:
+man:x:12:
+proxy:x:13:
+kmem:x:15:
+dialout:x:20:pi
+fax:x:21:
+voice:x:22:
+cdrom:x:24:pi
+floppy:x:25:
+tape:x:26:
+sudo:x:27:pi
+audio:x:29:pi
+dip:x:30:
+www-data:x:33:
+backup:x:34:
+operator:x:37:
+list:x:38:
+irc:x:39:
+src:x:40:
+gnats:x:41:
+shadow:x:42:
+utmp:x:43:
+video:x:44:pi
+sasl:x:45:
+plugdev:x:46:pi,kitten
+staff:x:50:
+games:x:60:pi
+users:x:100:pi
+nogroup:x:65534:
+libuuid:x:101:
+crontab:x:102:
+pi:x:1000:
+ssh:x:103:
+ntp:x:104:
+netdev:x:105:pi
+input:x:999:pi
+messagebus:x:106:
+lpadmin:x:107:
+fuse:x:108:
+lightdm:x:109:
+indiecity:x:1001:root
+spi:x:1002:pi
+gpio:x:1003:pi
+weston-launch:x:110:
+kitten:x:1004:
+systemd-journal:x:111:
diff --git a/fs/etc/pmount.allow b/fs/etc/pmount.allow
new file mode 100644
index 0000000..e9bb419
--- /dev/null
+++ b/fs/etc/pmount.allow
@@ -0,0 +1,5 @@
+# /etc/pmount.allow
+# pmount will allow users to additionally mount all devices that are
+# listed here.
+/dev/sdb1
+/dev/sda*
diff --git a/fs/etc/rc.local b/fs/etc/rc.local
index 65baa15..9410a5e 100755
--- a/fs/etc/rc.local
+++ b/fs/etc/rc.local
@@ -12,6 +12,7 @@
 # By default this script does nothing.
 
 clean(){
+    echo 'Rc Local done, quit.'
     systemctl poweroff
 }
 
@@ -27,7 +28,9 @@ if [ -e /dev/sda ]; then
     cd /opt/groomer
     /usr/sbin/led &
     # avoid possible misuse
-    /sbin/ifconfig eth0 down
+    systemctl stop display-manager
+    systemctl stop sshd
+    systemctl stop dbus-org.freedesktop.ModemManager1
     ./init.sh
     systemctl poweroff
   fi
diff --git a/fs/etc/security/limits.conf b/fs/etc/security/limits.conf
new file mode 100644
index 0000000..e8be267
--- /dev/null
+++ b/fs/etc/security/limits.conf
@@ -0,0 +1 @@
+kitten hard priority -20
diff --git a/fs/etc/systemd/system/rc-local.service b/fs/etc/systemd/system/rc-local.service
new file mode 100644
index 0000000..3d3cdf9
--- /dev/null
+++ b/fs/etc/systemd/system/rc-local.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=/etc/rc.local Compatibility
+ConditionPathExists=/etc/rc.local
+
+[Service]
+Type=oneshot
+ExecStart=/etc/rc.local start
+StandardOutput=tty
+RemainAfterExit=yes
+SysVStartPriority=99
+
+[Install]
+WantedBy=multi-user.target
diff --git a/fs/etc/udev/rules.d/90-qemu.rules b/fs/etc/udev/rules.d/90-qemu.rules
new file mode 100644
index 0000000..07dfc21
--- /dev/null
+++ b/fs/etc/udev/rules.d/90-qemu.rules
@@ -0,0 +1,2 @@
+KERNEL=="sdc", SYMLINK+="mmcblk0"
+KERNEL=="sdc?", SYMLINK+="mmcblk0p%n",
diff --git a/fs/opt/groomer/music.sh b/fs/opt/groomer/music.sh
index 4f9f6e2..8c769f0 100755
--- a/fs/opt/groomer/music.sh
+++ b/fs/opt/groomer/music.sh
@@ -5,6 +5,12 @@ set -e
 
 source ./constraint.sh
 
+killed(){
+    echo 'Music stopped.'
+}
+
+trap killed EXIT TERM INT
+
 # Force output on analog
 amixer cset numid=3 1
 
diff --git a/tests/run.exp b/tests/run.exp
index c4fa861..bda5bf7 100755
--- a/tests/run.exp
+++ b/tests/run.exp
@@ -2,7 +2,7 @@
 
 set timeout -1
 
-spawn qemu-system-arm -kernel 140730-kernel -cpu arm1176 -m 200 -M versatilepb \
+spawn qemu-system-arm -kernel 140801-kernel -cpu arm1176 -m 256 -M versatilepb \
     -append "root=/dev/sdc2 panic=1 rootfstype=ext4 ro console=ttyAMA0 console=ttyS0" \
     -drive file=[lindex $argv 1],index=0,media=disk \
     -drive file=[lindex $argv 2],index=1,media=disk \