Changed a lot of things on the daemon