finish date improvements
Merge origin/master
formatting