More email verification

More email verification things have been added. Still more to do.