javadoc update
start working on TokenBuffer improvements
Fix a UUID serialization problem, unit test bug (which masked serialization prob)