improvements and translation