added today/tomorrow/weekend functionality, handful of minor changes