tooltip and other small bug fixes