minor bug fixes. added variables to support value from dropdowns