Here and there minor improvements & cosmetic tweaks.