[#2882] Minor tweaks and additional information added