english and bug fixes