Minor fixes

Fixed some minor problems and made "Time" a permanent part of the tool tip text.