#tooltip beautified
fixes for #tooltip (work in progress)