Some bugfixes and input changed to Unicode.