a few tweaks, and improved unicode support