Headers and More

The first two commits are the new header-map stuff, everything else is just miscellaneous.