Tweaks and date update