updated emailer and fixed price calc