Improve token detection
fix datechecker