char set adjustment and minor correction