[pl] generalized rule for numeral adjectives, and enhancements to the word tokenizer... and some FIXMEs