Added email reminders & did a lot of cleanup