Tweaks
Working towards UTF-8 Support