Added email and fixed routes