edited the forms, reset, and some more