A few changes. I'm not sure if dbus really works this way.