huge update
fix mail