Undo Crypto-function, minor fixes