messing with email again
fixed some bugs
fixed merge