Cleaned up junk, added some dates