Making final some variables
Updating email address
Adding a timeout