Feedback fixes 2

This will fix my stupid email bug. #104 

Thanks @barbeau