Disabled Email Function and Small Changes