lots o changes, added email form