add date everywhere and some polish