Updated adding dates (thanks dedan) and NSCalendar singleton (thanks Lukasz M.)