added date whitelisting
added date grouping
added more formatting