updates to fix a few problems and enable email