fix up refollow and utf-8 issues