sigcomm deadline rush code changes (obviously bugfree)