general fixing headers etc.