a better email regexp and bug fixing