added email and hidden, cleanup