Minor fixes

-partially fixed the date issue