improved unicode handling
cleanup + unicode improvement