some improvements in the details 3