* Adding some stability and translation improvements