fixed function names and added confirmation emails