Improve tooltip; some fixes;