form email re-use and other small fixes.