minor changes
add support tokens like a &&, minor changes