Some tooltips added and labels changed