Added email stubs. More fixes. Hell I want to sleep