Few small fixes with date / punctuation