cleanup, new comments added
fixed: daemon_poll_init() was called in the wrong place