some finishing touches on #127; fix some charset stuff