headers, separators, bug fixes