Updated a lot of code

Started parsing emails