Adding of a few fixes to _form1