Change email address
Fix naming and typos