Datestamp and something...
Fixed some bugs, added some features