added more tokens
fixed confilicts