header mess cleaned up