more fix ups on form