Header tweaks.
Revert "work on shadow"

This reverts commit 6fcc17e234b7a7269fb48fd68c58ee48d740272f.