fix and improve reminder