Fix time + some formatting updates.