fixing a few bugs
adding date