Header, block dictionary keys no longer required to be strings.

Fixed block formatter so it returns the completed dictionary.