header and file tweaks