proper dates, tweaks