added hidden user support, emails, and other cleanups