changed email format, other small changes