added cleaner dates, still a few bugs