minor
support for multiple latencies, cleanup