fix daemon mode

pass all the new options in to the daemon and clean it up and ensure it
works properly