more fixes on Form
fixes for Form.java