Added tooltip text and error checking