Various improvements and translation