fixed bug, still have reminder bug