polish up long-poll and spec conformance