Fixed unicode and some other bugs that came up.