Include call for header info, minor changes

Based on suggestions by @keflavich