cleanup and bug fix to msg contact form