added form submission and some additional stuff