Order email confirmation and small fixes