#182 #208 Update email, additional fix