fixed email bug, minor fixes
Fixed #35
finally