push some more fixes and email issues