Improves day format and a bug