more tooltip demo fixes