fixed bugs and fixed email