Security Rised + More token fixes

Security Rised + More token fixes