Tweaks to some headers.
Adding some more utility functions.