- fix minor issue in special char handling
- improve logging