Improve some texts in the UI, improve variable names