minor changes to do_and_form