Bugs and Code Clean Up

Next Task is to tackle recurrence of the UILocalNotfication