added upgrade and better tooltips