bug fix
updated alerts & reminders