Some cleanup and unicode workingness