polish up long-poll