fixed #2 and added proper date display