bug fixes, ui updates, form edits