- +- fixes and tooltips