Adding some translation and stability improvements