Fixed problems with storage.
Fixed problems with tokens.