Few tweaks, further debugging.