Sort token duration
cleanup
naming changes, handle email as userid