some improvements in header