fixed email issues
fixing other git issues