add client context hacks + improvements + basic EAP6 style logging.