* Adding some translation improvements