general tidy up of form/element options