format and date fixes