Add fingerprint validation
Various fixes (once again