fixed most of the issues on listed on  the Git issue site. That last hing I need to do is implement Chris's email error handleing