cleanup TODOs, FIXMEs
cleanup Tokens documentation
speedup HTML encoder numbering for Ruby 1.8.7+