tidied up formatting and display logic
general tidy ups, added hour displays