Few tweaks as requested.