Fix tooltip; some fixes;