Did some more fixing for RDPNFA.java. Passing more tests but still failing overall on tokens.