Removed some hardcoded header keywords and keeps more keywords from original file