changed tooltips
pulled from master