updates, should work now with weird characters