watermark, tooltip fixes