Edit tooltips

Updated definitions for tooltips and added some new fields.