Few tweaks late june 31