Tool Tips and minor bug fixes