confirmation email resending, various small changes