improvments.

the scan is stuck on the first token. need to debug the next_token().