Add another charset, make two minor optimizations, and make a few other trivial changes