adding confirmation using email and small fixes