added some fixes to fingerprinting