Improve tokenization, rework lang

None of this is anywhere _near_ done.