A tweak to encoding of restricted characters and some javadoc updates.
Some javadoc updates.
Removed unused method.
Some spec updates.