minor changes, started tweaking naming convention and confirmation emails