Quite some packet debugging. Otherwise, minor fiddling.