minor renaming
parser impovements for empty tokens
extended tests for empty tokens
extended tests for empty tokens