Make time display nicer; other clean-up