improve timestamp readability
fix switching date
add date modification
merge