Cleaned up comments, added logic for 'and' in dates.