more work donw on form. Other tweaks