fixed the translation issue, other cleanup