added in clock, changed formatting a bit