many changes

add supply_form and other