fix token
fix mistakes