various improvements to form field population and data saving