changed email order, some corrections