lots of fixes on contact form