Added num tweets output and more time types