forms edit
misc edits