* Some translation and stability improvements