small bug fix
more bug fixes regarding charset issues