Fixed some problems with the reminder mechanism