Change email and cleaned up warnings