Slight improvements in mainForm.cs