Fixing the wrapper trickery, also better logging... crypto still not
working