comment + header ajustments