few headers fixed