More logging
Stability issues and special characters