fixed typos, ack in daemon and failing tests