Correct token insert location
Improve token behavior on insert.