Various updates, and added email attribute