implemented working tooltips
fixed merge