add seconds, remove calendar week & PM/24H