Almost ready for turning in

Email issue fixed, working on other bugs