Change the way dates are formatted and fix some more minor issues