code refinements, debugging, adding new form classes to save codelines