finetuned the safer key storage, needs to be tested on all OSs