minor tweaks + basic EAP6 style logging.