anonymize headers, some performance tweaks, reordered some sections