clean up header, add tracking