fix form submission
clean up