fix arguments
fix probelm with unicode
fix arguments in condition statements